Changeset 5361

Timestamp:

Jun 6, 2011, 1:52:08 AM (9 years ago)

Author:

Admin

Message:

Some internal restructuring regarding globals.h file to make it a bit more structured.

Location:

trunk

Files:

• global-functions.h (added)
• globals.h (modified) (20 diffs)
• module-stat.c (modified) (2 diffs)
• module-stat.h (deleted)
• oscam-ac.c (modified) (1 diff)
• oscam-http.c (modified) (1 diff)
• oscam-log.c (modified) (1 diff)
• oscam-simples.c (modified) (2 diffs)
• oscam.c (modified) (26 diffs)

trunk/globals.h

@@ -1 @@
-#define _GNU_SOURCE //prevents "implicit" warning for asprintf
 #include <stdlib.h>
 #include <stdio.h>
@@ -19 +18 @@
 #include <pwd.h>
 #include <netinet/tcp.h>
-
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -27 +25 @@
 #include <signal.h>
 #include <errno.h>
-
 #include <pthread.h>
 
@@ -35 +32 @@
 #include "cscrypt/idea.h"
 
+#include "oscam-config.h"
+
+#ifndef USE_CMAKE
+#  include "oscam-ostype.h"
+#endif
+#include "oscam-types.h"
+#include "cscrypt/cscrypt.h"
+
+#ifdef HAVE_PCSC
+  #ifdef OS_CYGWIN32
+    #define __reserved
+    #define __nullnullterminated
+    #include <specstrings.h>
+    #include "cygwin/WinSCard.h"
+  #else
+    #include <PCSC/pcsclite.h>
+    #ifdef OS_MACOSX
+        #include <PCSC/wintypes.h>
+    #else
+        #include <PCSC/reader.h>
+    #endif
+  #endif
+#endif
+
+#if defined(LIBUSB)
+#ifdef __FreeBSD__
+#include <libusb.h>
+#else
+#include <libusb-1.0/libusb.h>
+#endif
+#include "csctapi/smartreader_types.h"
+#endif
+
+/* ===========================
+ *         macros
+ * =========================== */
 // Prevent use of unsafe functions (doesn't work for MacOSX)
 #ifndef OS_MACOSX
@@ -41 +74 @@
 #define strtok(a,b,c) UNSAFE_STRTOK_USE_STRTOK_R_INSTEAD()
 #endif
-
-#ifndef CS_GLOBALS
-#define CS_GLOBALS
-#define CS_VERSION    "1.00-unstable_svn"
-#ifndef CS_SVN_VERSION
-#   define CS_SVN_VERSION "test"
-#endif
-
-#include "oscam-config.h"
 
 #ifdef UNUSED
@@ -77 +101 @@
 #endif
 
-#ifndef USE_CMAKE
-#  include "oscam-ostype.h"
-#endif
-#include "oscam-types.h"
-#include "cscrypt/cscrypt.h"
-
-#ifdef HAVE_PCSC
-  #ifdef OS_CYGWIN32
-    #define __reserved
-    #define __nullnullterminated
-    #include <specstrings.h>
-    #include "cygwin/WinSCard.h"
-  #else
-    #include <PCSC/pcsclite.h>
-    #ifdef OS_MACOSX
-        #include <PCSC/wintypes.h>
-    #else
-        #include <PCSC/reader.h>
-    #endif
-  #endif
-#endif
-
-#if defined(LIBUSB)
-#ifdef __FreeBSD__
-#include <libusb.h>
-#else
-#include <libusb-1.0/libusb.h>
-#endif
-#include "csctapi/smartreader_types.h"
-#endif
-
-// DM500 and Dbox2 have toolchains which don't match their plattform. Therefore pthread_cleanup_push can't be used (binaries compile but only work on DM 7020)
-#if defined(TUXBOX) && defined(PPC)
-#define NO_PTHREAD_CLEANUP_PUSH
-#endif
-
+//checking if (X) free(X) unneccessary since freeing a null pointer doesnt do anything
+#define NULLFREE(X) {if (X) {void *tmpX=X; X=NULL; free(tmpX); }}
+
+/* ===========================
+ *         constants
+ * =========================== */
+#ifndef CS_GLOBALS
+#define CS_GLOBALS
+#define CS_VERSION    "1.00-unstable_svn"
+#ifndef CS_SVN_VERSION
+#   define CS_SVN_VERSION "test"
+#endif
 #ifndef CS_CONFDIR
 #define CS_CONFDIR    "/usr/local/etc"
@@ -148 +148 @@
 
 #define CS_EMMCACHESIZE  64 //nr of EMMs that each client will cache; cache is per client, so memory-expensive...
+#define MSGLOGSIZE 64   //size of string buffer for a ecm to return messages
 
 #define D_TRACE     1 // Generate very detailed error/trace messages per routine
@@ -217 +218 @@
 #define MOD_ADDON       32
 
-
 #ifdef HAVE_DVBAPI
 #define BOXTYPE_DREAMBOX    1
@@ -238 +238 @@
 #define EMM_UNKNOWN 8
 
+//EMM types:
+#define UNKNOWN 0
+#define UNIQUE  1
+#define SHARED  2
+#define GLOBAL  3
+
 #ifdef CS_CORE
 char *PIP_ID_TXT[] = { "ECM", "EMM", "CIN", "KCL", "UDP", NULL  };
@@ -256 +262 @@
 #define PIP_ID_UDP    4
 #define PIP_ID_MAX    PIP_ID_UDP
-
-
 #define PIP_ID_ERR    (-1)
 #define PIP_ID_DIR    (-2)
@@ -294 +298 @@
       E2_CCCAM_NOCARD=0x27, E2_CCCAM_NOK1=0x28, E2_CCCAM_NOK2=0x29, E2_CCCAM_LOOP=0x30};
 
-pid_t server_pid; //alno: PID of server - set while startup
-
-// constants
 #define CTA_RES_LEN 512
 
@@ -313 +314 @@
 
 #ifdef QBOXHD_LED
-typedef struct {
-    uint16_t H;  // range 0-359
-    unsigned char S;   // range 0-99
-    unsigned char V;   // range 0-99
-} qboxhd_led_color_struct;
-typedef struct {
-    unsigned char red;  // first 5 bit used (&0x1F)
-    unsigned char green; // first 5 bit used (&0x1F)
-    unsigned char blue; // first 5 bit used (&0x1F)
-} qboxhdmini_led_color_struct;
-
-extern void qboxhd_led_blink(int32_t color, int32_t duration);
-
 #define QBOXHD_LED_DEVICE               "/dev/sw0"
 #define QBOXHD_SET_LED_ALL_PANEL_COLOR  _IO(0xBC, 13)    // payload = 3byte [H][S][V]
@@ -362 +350 @@
 #define BAN_DUPLICATE 8         //failban mask for duplicate user
 
-//checking if (X) free(X) unneccessary since freeing a null pointer doesnt do anything
-#define NULLFREE(X) {if (X) {void *tmpX=X; X=NULL; free(tmpX); }}
-
+#define AVAIL_CHECK_CONNECTED 0
+#define AVAIL_CHECK_LOADBALANCE 1
+
+#define LB_MAX_STAT_TIME 10
+
+/* ===========================
+ *      global structures
+ * =========================== */
 typedef struct s_caidvaluetab
 {
@@ -469 +462 @@
     time_t v_time;
 } V_BAN;
-
-#define AVAIL_CHECK_CONNECTED 0
-#define AVAIL_CHECK_LOADBALANCE 1
 
 struct s_client ;
@@ -558 +548 @@
 #endif
 
-#define MSGLOGSIZE 64
 typedef struct ecm_request_t
 {
@@ -564 +553 @@
   uchar         cw[16];
   uchar         ecmd5[CS_ECMSTORESIZE];
-//  uchar         l;
   int16_t         l;
   uint16_t        caid;
@@ -1112 +1100 @@
     struct s_auth   *account;
     struct s_srvid  *srvid[16];
-        struct s_tierid *tierid;
+    struct s_tierid *tierid;
     //Todo #ifdef CCCAM
     struct s_provid *provid;
@@ -1269 +1257 @@
 };
 
-//Loadbalance constants:
-#define LB_NONE 0
-#define LB_FASTEST_READER_FIRST 1
-#define LB_OLDEST_READER_FIRST 2
-#define LB_LOWEST_USAGELEVEL 3
-#define LB_LOG_ONLY 10
-
-#define LB_MAX_STAT_TIME 10
-
 typedef struct reader_stat_t
 {
@@ -1307 +1286 @@
 } EMM_PACKET;
 
-//EMM types:
-#define UNKNOWN 0
-#define UNIQUE  1
-#define SHARED  2
-#define GLOBAL  3
-
-// oscam-simples
-extern char *remote_txt(void);
-extern char *trim(char *);
-extern char *strtolower(char *);
-extern int32_t gethexval(char);
-extern int32_t cs_atob(uchar *, char *, int32_t);
-extern uint32_t cs_atoi(char *, int32_t, int32_t);
-extern int32_t byte_atob(char *);
-extern int32_t word_atob(char *);
-extern int32_t dyn_word_atob(char *asc);
-extern int32_t key_atob_l(char *, uchar *, int32_t);
-extern char *key_btoa(char *, uchar *);
-extern char *cs_hexdump(int32_t, const uchar *, int32_t);
-extern char *cs_hexdump_buf(int32_t, const uchar *, int32_t, char *target, int32_t len);
-extern in_addr_t cs_inet_order(in_addr_t);
-extern char *cs_inet_ntoa(in_addr_t);
-extern in_addr_t cs_inet_addr(char *txt);
-extern uint32_t b2i(int32_t, uchar *);
-extern uint64_t b2ll(int32_t, uchar *);
-extern uchar *i2b_buf(int32_t n, uint32_t i, uchar *b);
-
-extern uint32_t a2i(char *, int32_t);
-extern int32_t boundary(int32_t, int32_t);
-extern void cs_ftime(struct timeb *);
-extern void cs_sleepms(uint32_t);
-extern void cs_sleepus(uint32_t);
-extern void cs_setpriority(int32_t);
-extern struct s_auth *find_user(char *);
-extern int32_t check_filled(uchar *value, int32_t length);
-extern void *cs_malloc(void *result, size_t size, int32_t quiterror);
-extern void *cs_realloc(void *result, size_t size, int32_t quiterror);
-#ifdef WEBIF
-extern char to_hex(char code);
-extern void char_to_hex(const unsigned char* p_array, uint32_t p_array_len, unsigned char *result);
-extern void create_rand_str(char *dst, int32_t size);
-#endif
-extern int32_t file_exists(const char * filename);
-extern void clear_sip(struct s_ip **sip);
-extern void clear_ptab(struct s_ptab *ptab);
-extern void clear_ftab(struct s_ftab *ftab);
-void clear_caidtab(struct s_caidtab *ctab);
-void clear_tuntab(struct s_tuntab *ttab);
-extern int32_t file_copy(char *srcfile, char *destfile);
-extern int32_t safe_overwrite_with_bak(char *destfile, char *tmpfile, char *bakfile, int32_t forceBakOverWrite);
-extern void fprintf_conf(FILE *f, int32_t varnameWidth, const char *varname, const char *fmtstring, ...);
-extern void cs_strncpy(char * destination, const char * source, size_t num);
-extern char *get_servicename(struct s_client *cl, int32_t srvid, int32_t caid, char *buf);
-extern char *get_tiername(int32_t tierid, int32_t caid, char *buf);
-extern char *get_provider(int32_t caid, uint32_t provid, char *buf);
-extern void make_non_blocking(int32_t fd);
-extern uchar fast_rnd(void);
-extern void init_rnd(void);
-extern int32_t hexserialset(struct s_reader *rdr);
-extern char *monitor_get_proto(struct s_client *);
-extern char *reader_get_type_desc(struct s_reader * rdr, int32_t extended);
-extern char *get_ncd_client_name(char *client_id);
-extern int32_t cs_strnicmp(const char * str1, const char * str2, size_t num);
-extern char *strnew(char *str);
-extern void hexserial_to_newcamd(uchar *source, uchar *dest, uint16_t caid);
-extern void newcamd_to_hexserial(uchar *source, uchar *dest, uint16_t caid);
-extern int32_t check_ip(struct s_ip *ip, in_addr_t n);
-#ifdef WITH_MUTEXDEBUG
-extern int32_t cs_lock_debug(pthread_mutex_t *mutex, char *file, uint16_t line);
-extern int32_t cs_trylock_debug(pthread_mutex_t *mutex, char *file, uint16_t line);
-extern int32_t cs_unlock_debug(pthread_mutex_t *mutex, char *file, uint16_t line);
-#define cs_lock(x) cs_lock_debug(x,__FILE__, __LINE__)
-#define cs_trylock(x) cs_trylock_debug(x,__FILE__, __LINE__)
-#define cs_unlock(x) cs_unlock_debug(x,__FILE__, __LINE__)
-#else
-extern int32_t cs_lock(pthread_mutex_t *mutex);
-extern int32_t cs_trylock(pthread_mutex_t *mutex);
-extern int32_t cs_unlock(pthread_mutex_t *mutex);
-#endif
-extern void cs_cleanlocks();
-extern uint32_t cs_getIPfromHost(const char *hostname);
-
+#ifdef QBOXHD_LED
+typedef struct {
+    uint16_t H;  // range 0-359
+    unsigned char S;   // range 0-99
+    unsigned char V;   // range 0-99
+} qboxhd_led_color_struct;
+typedef struct {
+    unsigned char red;  // first 5 bit used (&0x1F)
+    unsigned char green; // first 5 bit used (&0x1F)
+    unsigned char blue; // first 5 bit used (&0x1F)
+} qboxhdmini_led_color_struct;
+#endif
+
+
+/* ===========================
+ *      global variables
+ * =========================== */
+extern char cs_tmpdir[200];
 extern pthread_key_t getclient;
-extern struct s_client * cur_client(void);
 extern struct s_client *first_client;
 extern struct s_reader *first_active_reader; //points to list of _active_ readers (enable = 1, deleted = 0)
 extern LLIST *configured_readers;
-
-// oscam variables
-
 extern int32_t cs_dblevel;
-
 extern uint16_t len4caid[256];
-
-extern struct card_struct *Cards;
-//extern struct idstore_struct *idstore;
-extern uint32_t *IgnoreList;
-
 extern struct s_config cfg;
 extern char cs_confdir[];
@@ -1411 +1316 @@
 extern struct s_cardsystem cardsystem[CS_MAX_MOD];
 extern struct s_cardreader cardreader[CS_MAX_MOD];
-//extern ECM_REQUEST *ecmtask;
+extern pthread_mutex_t gethostbyname_lock;
+
+pid_t server_pid; // PID of server - set while startup
 
 #ifdef CS_ANTICASC
 extern FILE *fpa;
 #endif
-extern pthread_mutex_t gethostbyname_lock;
-
-// oscam
-#ifdef WEBIF
-extern void cs_exit_oscam();
-extern void cs_restart_oscam();
-extern int32_t cs_get_restartmode();
-
-//reset stats for webif:
-extern void clear_account_stats(struct s_auth *account);
-extern void clear_all_account_stats();
-extern void clear_system_stats();
-
-#endif
-extern void start_thread(void * startroutine, char * nameroutine);
-extern void cs_reload_config();
-extern int32_t recv_from_udpipe(uchar *);
-extern char* username(struct s_client *);
-extern struct s_client * get_client_by_tid(uint32_t);
-extern int32_t chk_bcaid(ECM_REQUEST *, CAIDTAB *);
-extern void cs_exit(int32_t sig);
-extern int32_t comp_timeb(struct timeb *tpa, struct timeb *tpb);
-extern struct s_client * create_client(in_addr_t);
-extern int32_t cs_auth_client(struct s_client *, struct s_auth *, const char*);
-extern void cs_disconnect_client(struct s_client *);
-extern int32_t check_cwcache2(ECM_REQUEST *, uint64_t grp);
-extern int32_t write_to_pipe(int32_t, int32_t, uchar *, int32_t);
-extern int32_t read_from_pipe(int32_t, uchar **);
-extern int32_t write_ecm_answer(struct s_reader *, ECM_REQUEST *);
-extern void log_emm_request(struct s_reader *);
-extern uint32_t chk_provid(uchar *, uint16_t);
-extern void convert_to_beta(struct s_client *cl, ECM_REQUEST *er, uint16_t caidto);
-#ifdef IRDETO_GUESSING
-extern void guess_irdeto(ECM_REQUEST *);
-#endif
-extern void get_cw(struct s_client *, ECM_REQUEST *);
-extern void do_emm(struct s_client *, EMM_PACKET *);
-extern ECM_REQUEST *get_ecmtask(void);
-extern void request_cw(ECM_REQUEST *, int32_t, int32_t);
-extern void send_reader_stat(struct s_reader *rdr, ECM_REQUEST *er, int32_t rc);
-extern int32_t send_dcw(struct s_client *, ECM_REQUEST *);
-extern int32_t process_input(uchar *, int32_t, int32_t);
-extern int32_t has_srvid(struct s_client *cl, ECM_REQUEST *er);
-extern int32_t chk_srvid(struct s_client *, ECM_REQUEST *);
-extern int32_t chk_srvid_match(ECM_REQUEST *, SIDTAB *);
-extern int32_t chk_sfilter(ECM_REQUEST *, PTAB*);
-extern int32_t chk_ufilters(ECM_REQUEST *);
-extern int32_t chk_rsfilter(struct s_reader * reader, ECM_REQUEST *);
-extern int32_t matching_reader(ECM_REQUEST *, struct s_reader *);
-extern int32_t emm_reader_match(struct s_reader *reader, uint16_t caid, uint32_t provid);
-extern void set_signal_handler(int32_t , int32_t , void (*));
-extern void cs_log_config(void);
-extern void cs_waitforcardinit(void);
-extern void cs_reinit_clients(struct s_auth *new_accounts);
-extern int32_t process_client_pipe(struct s_client *cl, uchar *buf, int32_t l);
-extern void update_reader_config(uchar *ptr);
-extern int32_t chk_ctab(uint16_t caid, CAIDTAB *ctab);
-extern int32_t chk_srvid_by_caid_prov(struct s_client *, uint16_t caid, uint32_t provid);
-extern void nullclose(int32_t *fd);
-extern void *clientthread_init(void * init);
-extern void cleanup_thread(void *var);
-extern void kill_thread(struct s_client *cl);
-extern void remove_reader_from_active(struct s_reader *rdr);
-extern void add_reader_to_active(struct s_reader *rdr);
-extern int32_t get_threadnum(struct s_client *client);
-extern void cs_add_violation(uint32_t ip);
-
-extern void cs_card_info(void);
-extern void cs_debug_level(void);
-
-#ifdef CS_ANTICASC
-extern void init_ac(void);
-extern void ac_init_stat();
-extern void ac_clear();
-extern void ac_done_stat();
-extern int32_t  ac_init_log();
-extern void ac_do_stat(void);
-extern void ac_init_client(struct s_client *, struct s_auth *);
-extern void ac_chk(struct s_client *,ECM_REQUEST*, int32_t);
-#endif
-
-// oscam-config
-extern int32_t  init_config(void);
-extern int32_t  init_free_userdb(struct s_auth *auth);
-extern struct s_auth *init_userdb();
-extern int32_t  init_readerdb(void);
-extern void free_reader(struct s_reader *rdr);
-extern int32_t  init_sidtab(void);
-extern void free_sidtab(struct s_sidtab *sidtab);
-extern void init_free_sidtab();
-extern int32_t  init_srvid(void);
-extern int32_t  init_tierid(void);
-extern int32_t  search_boxkey(uint16_t, char *);
-extern void init_len4caid(void);
-#ifdef IRDETO_GUESSING
-extern int32_t  init_irdeto_guess_tab(void);
-#endif
-extern void chk_caidtab(char *caidasc, CAIDTAB *ctab);
-extern void chk_tuntab(char *tunasc, TUNTAB *ttab);
-extern void chk_services(char *labels, SIDTABBITS *sidok, SIDTABBITS *sidno);
-extern void chk_ftab(char *zFilterAsc, FTAB *ftab, const char *zType, const char *zName, const char *zFiltName);
-extern void chk_cltab(char *classasc, CLASSTAB *clstab);
-extern void chk_iprange(char *value, struct s_ip **base);
-extern void chk_port_tab(char *portasc, PTAB *ptab);
-#ifdef CS_ANTICASC
-extern void chk_t_ac(char *token, char *value);
-#endif
-extern void chk_t_camd33(char *token, char *value);
-extern void chk_t_camd35(char *token, char *value);
-extern void chk_t_camd35_tcp(char *token, char *value);
-extern void chk_t_newcamd(char *token, char *value);
-extern void chk_t_radegast(char *token, char *value);
-extern void chk_t_serial(char *token, char *value);
-extern void chk_t_gbox(char *token, char *value);
-#ifdef MODULE_CCCAM
-extern void chk_t_cccam(char *token, char *value);
-#endif
-extern void chk_t_global(const char *token, char *value);
-extern void chk_t_monitor(char *token, char *value);
-extern void chk_reader(char *token, char *value, struct s_reader *rdr);
-
-#ifdef HAVE_DVBAPI
-extern void chk_t_dvbapi(char *token, char *value);
-void dvbapi_chk_caidtab(char *caidasc, char type);
-void dvbapi_read_priority();
-#endif
-
-#ifdef WEBIF
-extern void chk_t_webif(char *token, char *value);
-#endif
-
-#ifdef LCDSUPPORT
-extern void chk_t_lcd(char *token, char *value);
-#endif
-
-extern void cs_accounts_chk(void);
-extern void chk_account(const char *token, char *value, struct s_auth *account);
-extern void chk_sidtab(char *token, char *value, struct s_sidtab *sidtab);
-extern int32_t write_services();
-extern int32_t write_userdb(struct s_auth *authptr);
-extern int32_t write_config();
-extern int32_t write_server();
-extern void write_versionfile();
-extern char *mk_t_caidtab(CAIDTAB *ctab);
-extern char *mk_t_caidvaluetab(CAIDVALUETAB *tab);
-extern char *mk_t_tuntab(TUNTAB *ttab);
-extern char *mk_t_group(uint64_t grp);
-extern char *mk_t_ftab(FTAB *ftab);
-extern char *mk_t_camd35tcp_port();
-extern char *mk_t_cccam_port();
-extern char *mk_t_aeskeys(struct s_reader *rdr);
-extern char *mk_t_newcamd_port();
-extern char *mk_t_aureader(struct s_auth *account);
-extern char *mk_t_nano(struct s_reader *rdr, uchar flag);
-extern char *mk_t_service( uint64_t sidtabok, uint64_t sidtabno);
-extern char *mk_t_logfile();
-extern char *mk_t_iprange(struct s_ip *range);
-extern char *mk_t_ecmwhitelist(struct s_ecmWhitelist *whitelist);
-extern char *mk_t_cltab(CLASSTAB *clstab);
-extern void free_mk_t(char *value);
-
-//Todo #ifdef CCCAM
-extern int32_t init_provid();
-extern char * get_tmp_dir();
-extern void init_share();
-extern void done_share();
-
-// oscam-reader
-extern int32_t logfd;
-extern int32_t reader_cmd2icc(struct s_reader * reader, const uchar *buf, const int32_t l, uchar *response, uint16_t *response_length);
-extern int32_t card_write(struct s_reader * reader, const uchar *, const uchar *, uchar *, uint16_t *);
-extern int32_t check_sct_len(const unsigned char *data, int32_t off);
-extern void cs_ri_brk(struct s_reader * reader, int32_t);
-extern void cs_ri_log(struct s_reader * reader, char *,...);
-extern void * start_cardreader(void *);
-extern void reader_card_info(struct s_reader * reader);
-extern int32_t hostResolve(struct s_reader * reader);
-extern int32_t network_tcp_connection_open();
-extern void network_tcp_connection_close(struct s_client *, int32_t);
-extern int32_t casc_recv_timer(struct s_reader * reader, uchar *buf, int32_t l, int32_t msec);
-extern void clear_reader_pipe(struct s_reader * reader);
-extern void block_connect(struct s_reader *rdr);
-extern int32_t is_connect_blocked(struct s_reader *rdr);
-
-// oscam-log
-extern int32_t  cs_init_log();
-extern void cs_reinit_loghist(uint32_t size);
-extern int32_t cs_open_logfiles();
-extern void cs_write_log(char *);
-extern void cs_log(const char *,...);
-#ifdef WITH_DEBUG
-extern void cs_debug_mask(uint16_t, const char *,...);
-extern void cs_ddump_mask(uint16_t, const uchar *, int32_t, char *, ...);
-#else
-#define nop() asm volatile("nop")
-#define cs_debug(...) nop()
-#define cs_debug_mask(...) nop()
-#define cs_ddump(...) nop()
-#define cs_ddump_mask(...) nop()
-#endif
-extern void cs_close_log(void);
-extern int32_t  cs_init_statistics();
-extern void cs_dump(const uchar *, int32_t, char *, ...);
-
-// oscam-aes
-extern void aes_set_key(char *);
-extern void aes_encrypt_idx(struct s_client *, uchar *, int32_t);
-extern void aes_decrypt(uchar *, int32_t);
-extern int32_t aes_decrypt_from_list(AES_ENTRY *list, uint16_t caid, uint32_t provid,int32_t keyid, uchar *buf, int32_t n);
-extern int32_t aes_present(AES_ENTRY *list, uint16_t caid, uint32_t provid,int32_t keyid);
-extern void parse_aes_keys(struct s_reader *rdr,char *value);
-
-#define aes_encrypt(b, n) aes_encrypt_idx(cur_client(), b, n)
-
-// reader-common
-extern int32_t reader_device_init(struct s_reader * reader);
-extern int32_t reader_checkhealth(struct s_reader * reader);
-extern void reader_post_process(struct s_reader * reader);
-extern int32_t reader_ecm(struct s_reader * reader, ECM_REQUEST *);
-extern int32_t reader_emm(struct s_reader * reader, EMM_PACKET *);
-int32_t reader_get_emm_type(EMM_PACKET *ep, struct s_reader * reader);
-struct s_cardsystem *get_cardsystem_by_caid(uint16_t caid);
-extern void reader_device_close(struct s_reader * reader);
-
-#ifdef WITH_LB
-//module-stat
-extern void init_stat();
-extern int32_t get_best_reader(ECM_REQUEST *er);
-extern void clear_reader_stat(struct s_reader *reader);
-extern void add_stat(struct s_reader *rdr, ECM_REQUEST *er, int32_t ecm_time, int32_t rc);
-extern void load_stat_from_file();
-extern void save_stat_to_file(int32_t);
-extern void clear_all_stat();
-extern void housekeeping_stat(int32_t force);
-extern void sort_stat(struct s_reader *rdr, int32_t reverse);
-#endif
-
-#ifdef HAVE_PCSC
-// reader-pcsc
-extern void pcsc_close(struct s_reader *pcsc_reader);
-#endif
-
-void reader_nagra();
-void reader_irdeto();
-void reader_cryptoworks();
-void reader_viaccess();
-void reader_conax();
-void reader_seca();
-void reader_videoguard1();
-void reader_videoguard2();
-void reader_videoguard12();
-void reader_dre();
-void reader_tongfang();
-
-void cardreader_mouse(struct s_cardreader *crdr);
-void cardreader_smargo(struct s_cardreader *crdr);
-#ifdef WITH_STAPI
-void cardreader_stapi(struct s_cardreader *crdr);
-#endif
-
-// protocol modules
-extern int32_t  monitor_send_idx(struct s_client *, char *);
-extern void module_monitor(struct s_module *);
-extern void module_camd35(struct s_module *);
-extern void module_camd35_tcp(struct s_module *);
-extern void module_camd33(struct s_module *);
-extern void module_newcamd(struct s_module *);
-extern void module_radegast(struct s_module *);
-extern void module_oscam_ser(struct s_module *);
-#ifdef MODULE_CCCAM
-extern void module_cccam(struct s_module *);
-#endif
-extern void module_gbox(struct s_module *);
-extern void module_constcw(struct s_module *);
-extern int32_t chk_pending(int32_t timeout);
-#ifdef HAVE_DVBAPI
-extern void module_dvbapi(struct s_module *);
-#endif
-
-#ifdef WEBIF
-// oscam-http
-extern void http_srv();
-#endif
-
-// oscam-garbage
-#ifdef WITH_DEBUG
-extern void add_garbage_debug(void *data, char *file, uint16_t line);
-#define add_garbage(x)  add_garbage_debug(x,__FILE__, __LINE__)
-#else
-extern void add_garbage(void *data);
-#endif
-extern void start_garbage_collector(int32_t);
-extern void stop_garbage_collector();
-
-#ifdef LCDSUPPORT
-// oscam-lcd
-extern void start_lcd_thread();
-extern void end_lcd_thread();
-#endif
+
+/* ===========================
+ *      global functions
+ * =========================== */
+#include "global-functions.h"
 
 #endif  // CS_GLOBALS

trunk/module-stat.c

@@ -2 +2 @@
 
 #ifdef WITH_LB
-#include "module-stat.h"
 #include "module-cccam.h"
 
@@ -10 +9 @@
 #define LB_REOPEN_MODE_STANDARD 0
 #define LB_REOPEN_MODE_FAST 1
+
+#define LB_NONE 0
+#define LB_FASTEST_READER_FIRST 1
+#define LB_OLDEST_READER_FIRST 2
+#define LB_LOWEST_USAGELEVEL 3
+#define LB_LOG_ONLY 10
 
 static int32_t stat_load_save;

trunk/oscam-ac.c

@@ -112 +112 @@
 }
 
+/* Starts the anticascader thread. */
+void start_anticascader(){
+  struct s_client * cl = create_client(first_client->ip);
+  if (cl == NULL) return;
+  cl->thread = pthread_self();
+  pthread_setspecific(getclient, cl);
+  cl->typ = 'a';
+
+  ac_init_stat();
+  while(1)
+  {
+    int32_t i;
+    for( i=0; i<cfg.ac_stime*60; i++ )
+        cs_sleepms(1000); //FIXME this is a cpu-killer!
+    ac_do_stat();
+  }
+}
+
 void ac_init_client(struct s_client *client, struct s_auth *account)
 {

trunk/oscam-http.c

@@ -14 +14 @@
 #include "module-cccam.h"
 #include "module-cccshare.h"
-#include "module-stat.h"
 
 extern void restart_cardreader(struct s_reader *rdr, int32_t restart);

trunk/oscam-log.c

@@ -348 +348 @@
 }
 #endif
+
+void log_emm_request(struct s_reader *rdr){
+    cs_log("%s emm-request sent (reader=%s, caid=%04X, auprovid=%06lX)",
+            username(cur_client()), rdr->label, rdr->caid,
+            rdr->auprovid ? rdr->auprovid : b2i(4, rdr->prid[0]));
+}
+
+/*
+ * This function writes the current CW from ECM struct to a cwl file.
+ * The filename is re-calculated and file re-opened every time.
+ * This will consume a bit cpu time, but nothing has to be stored between
+ * each call. If not file exists, a header is prepended
+ */
+void logCWtoFile(ECM_REQUEST *er){
+    FILE *pfCWL;
+    char srvname[128];
+    /* %s / %s   _I  %04X  _  %s  .cwl  */
+    char buf[256 + sizeof(srvname)];
+    char date[7];
+    unsigned char  i, parity, writeheader = 0;
+    time_t t;
+    struct tm timeinfo;
+
+    /*
+    * search service name for that id and change characters
+    * causing problems in file name
+    */
+
+    get_servicename(cur_client(), er->srvid, er->caid, srvname);
+
+    for (i = 0; srvname[i]; i++)
+        if (srvname[i] == ' ') srvname[i] = '_';
+
+    /* calc log file name */
+    time(&t);
+    localtime_r(&t, &timeinfo);
+    strftime(date, sizeof(date), "%Y%m%d", &timeinfo);
+    snprintf(buf, sizeof(buf), "%s/%s_I%04X_%s.cwl", cfg.cwlogdir, date, er->srvid, srvname);
+
+    /* open failed, assuming file does not exist, yet */
+    if((pfCWL = fopen(buf, "r")) == NULL) {
+        writeheader = 1;
+    } else {
+    /* we need to close the file if it was opened correctly */
+        fclose(pfCWL);
+    }
+
+    if ((pfCWL = fopen(buf, "a+")) == NULL) {
+        /* maybe this fails because the subdir does not exist. Is there a common function to create it?
+            for the moment do not print32_t to log on every ecm
+            cs_log(""error opening cw logfile for writing: %s (errno=%d %s)", buf, errno, strerror(errno)); */
+        return;
+    }
+    if (writeheader) {
+        /* no global macro for cardserver name :( */
+        fprintf(pfCWL, "# OSCam cardserver v%s - http://streamboard.gmc.to/oscam/\n", CS_VERSION);
+        fprintf(pfCWL, "# control word log file for use with tsdec offline decrypter\n");
+        strftime(buf, sizeof(buf),"DATE %Y-%m-%d, TIME %H:%M:%S, TZ %Z\n", &timeinfo);
+        fprintf(pfCWL, "# %s", buf);
+        fprintf(pfCWL, "# CAID 0x%04X, SID 0x%04X, SERVICE \"%s\"\n", er->caid, er->srvid, srvname);
+    }
+
+    parity = er->ecm[0]&1;
+    fprintf(pfCWL, "%d ", parity);
+    for (i = parity * 8; i < 8 + parity * 8; i++)
+        fprintf(pfCWL, "%02X ", er->cw[i]);
+    /* better use incoming time er->tps rather than current time? */
+    strftime(buf,sizeof(buf),"%H:%M:%S\n", &timeinfo);
+    fprintf(pfCWL, "# %s", buf);
+    fflush(pfCWL);
+    fclose(pfCWL);
+}
+
+void cs_log_config()
+{
+  uchar buf[20];
+
+  if (cfg.nice!=99)
+    snprintf((char *)buf, sizeof(buf), ", nice=%d", cfg.nice);
+  else
+    buf[0]='\0';
+  cs_log("version=%s, build #%s, system=%s-%s-%s%s", CS_VERSION, CS_SVN_VERSION, CS_OS_CPU, CS_OS_HW, CS_OS_SYS, buf);
+  cs_log("client max. idle=%d sec, debug level=%d", cfg.cmaxidle, cs_dblevel);
+
+  if( cfg.max_log_size )
+    snprintf((char *)buf, sizeof(buf), "%d Kb", cfg.max_log_size);
+  else
+    cs_strncpy((char *)buf, "unlimited", sizeof(buf));
+  cs_log("max. logsize=%s, loghistorysize=%d bytes", buf, cfg.loghistorysize);
+  cs_log("client timeout=%lu ms, fallback timeout=%lu ms, cache delay=%d ms",
+         cfg.ctimeout, cfg.ftimeout, cfg.delay);
+}
+
 int32_t cs_init_statistics(void) 
 {

trunk/oscam-simples.c

@@ -3 +3 @@
 #include "globals.h"
 #include "module-cccam.h"
+
+/* Gets the client associated to the calling thread. */
+struct s_client *cur_client(void){
+    return (struct s_client *) pthread_getspecific(getclient);
+}
+
+/* Gets the unique thread number from the client. Used in monitor and newcamd. */
+int32_t get_threadnum(struct s_client *client) {
+    struct s_client *cl;
+    int32_t count=0;
+
+    for (cl=first_client->next; cl ; cl=cl->next) {
+        if (cl->typ==client->typ)
+            count++;
+        if(cl==client)
+            return count;
+    }
+    return 0;
+}
+
+/* Gets the tmp dir */
+char *get_tmp_dir(){
+  if (cs_tmpdir[0])
+    return cs_tmpdir;
+
+#ifdef OS_CYGWIN32
+  char *d = getenv("TMPDIR");
+  if (!d || !d[0])
+    d = getenv("TMP");
+  if (!d || !d[0])
+    d = getenv("TEMP");
+  if (!d || !d[0])
+    getcwd(cs_tmpdir, sizeof(cs_tmpdir)-1);
+
+  cs_strncpy(cs_tmpdir, d, sizeof(cs_tmpdir));
+  char *p = cs_tmpdir;
+  while(*p) p++;
+  p--;
+  if (*p != '/' && *p != '\\')
+    strcat(cs_tmpdir, "/");
+  strcat(cs_tmpdir, "_oscam");
+#else
+  cs_strncpy(cs_tmpdir, "/tmp/.oscam", sizeof(cs_tmpdir));
+#endif
+  mkdir(cs_tmpdir, S_IRWXU);
+  return cs_tmpdir;
+}
 
 void aes_set_key(char *key)
@@ -250 +297 @@
 }
 
+int32_t comp_timeb(struct timeb *tpa, struct timeb *tpb)
+{
+  if (tpa->time>tpb->time) return(1);
+  if (tpa->time<tpb->time) return(-1);
+  if (tpa->millitm>tpb->millitm) return(1);
+  if (tpa->millitm<tpb->millitm) return(-1);
+  return(0);
+}
+
 int32_t cs_atob(uchar *buf, char *asc, int32_t n)
 {

trunk/oscam.c

@@ -15 +15 @@
 #endif
 
-extern void cs_statistics(struct s_client * client);
-extern int32_t ICC_Async_Close (struct s_reader *reader);
 static void cs_fake_client(struct s_client *client, char *usr, int32_t uniq, in_addr_t ip);
 
@@ -33 +31 @@
 uint16_t  len4caid[256];    // table for guessing caid (by len)
 char  cs_confdir[128]=CS_CONFDIR;
-int32_t cs_dblevel=0;   // Debug Level (TODO !!)
+int32_t cs_dblevel=0;   // Debug Level
 #ifdef WEBIF
-int32_t cs_restart_mode=1; //Restartmode: 0=off, no restart fork, 1=(default)restart fork, restart by webif, 2=like=1, but also restart on segfaults
-#endif
-int32_t cs_capture_SEGV=0;
+int8_t cs_restart_mode=1; //Restartmode: 0=off, no restart fork, 1=(default)restart fork, restart by webif, 2=like=1, but also restart on segfaults
+#endif
+int8_t cs_capture_SEGV=0;
 char  cs_tmpdir[200]={0x00};
 pthread_mutex_t gethostbyname_lock;
@@ -55 +53 @@
 char    *loghist = NULL;     // ptr of log-history
 char    *loghistptr = NULL;
-
-int32_t get_threadnum(struct s_client *client) {
-    struct s_client *cl;
-    int32_t count=0;
-
-    for (cl=first_client->next; cl ; cl=cl->next) {
-        if (cl->typ==client->typ)
-            count++;
-        if(cl==client)
-            return count;
-    }
-    return 0;
-}
-
-struct s_client * cur_client(void)
-{
-    return (struct s_client *) pthread_getspecific(getclient);
-}
 
 int32_t cs_check_v(uint32_t ip, int32_t add) {
@@ -149 +129 @@
 static const char *logo = "  ___  ____   ___                \n / _ \\/ ___| / __|__ _ _ __ ___  \n| | | \\___ \\| |  / _` | '_ ` _ \\ \n| |_| |___) | |_| (_| | | | | | |\n \\___/|____/ \\___\\__,_|_| |_| |_|\n";
 
+/* Prints usage information and information about the built-in modules. */
 static void usage()
 {
@@ -346 +327 @@
 }
 
+/* Returns the username from the client. You will always get a char reference back (no NULLs but it may be string containting "NULL")
+   which you should never modify and not free()! */
 char *username(struct s_client * client)
 {
@@ -412 +395 @@
   er->caid=caid;
   return(1);
-}
-
-/*
- * void set_signal_handler(int32_t sig, int32_t flags, void (*sighandler)(int))
- * flags: 1 = restart, 2 = don't modify if SIG_IGN, may be combined
- */
-void set_signal_handler(int32_t sig, int32_t flags, void (*sighandler))
-{
-#ifdef CS_SIGBSD
-  if ((signal(sig, sighandler)==SIG_IGN) && (flags & 2))
-  {
-    signal(sig, SIG_IGN);
-    siginterrupt(sig, 0);
-  }
-  else
-    siginterrupt(sig, (flags & 1) ? 0 : 1);
-#else
-  struct sigaction sa;
-  sigaction(sig, (struct sigaction *) 0, &sa);
-  if (!((flags & 2) && (sa.sa_handler==SIG_IGN)))
-  {
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags=(flags & 1) ? SA_RESTART : 0;
-    sa.sa_handler=sighandler;
-    sigaction(sig, &sa, (struct sigaction *) 0);
-  }
-#endif
-}
-
-static void cs_master_alarm()
-{
-  cs_log("PANIC: master deadlock!");
-  fprintf(stderr, "PANIC: master deadlock!");
-  fflush(stderr);
-}
-
-static void cs_sigpipe()
-{
-    if (cs_dblevel & D_ALL_DUMP)
-        cs_log("Got sigpipe signal -> captured");
 }
 
@@ -585 +528 @@
         if(cl->pfd)     nullclose(&cl->pfd); //Closing Network socket
         if(cl->fd_m2c_c)    nullclose(&cl->fd_m2c_c); //Closing client read fd
-        if(cl->fd_m2c)  nullclose(&cl->fd_m2c); //Closing client read fd
+        if(cl->fd_m2c)  nullclose(&cl->fd_m2c); //Closing master write fd
 
         if(cl->typ == 'r' && cl->reader){
@@ -644 +587 @@
     cfg.account = NULL;
     init_free_sidtab();
+}
+
+/*
+ * flags: 1 = restart, 2 = don't modify if SIG_IGN, may be combined
+ */
+void set_signal_handler(int32_t sig, int32_t flags, void (*sighandler))
+{
+#ifdef CS_SIGBSD
+  if ((signal(sig, sighandler)==SIG_IGN) && (flags & 2))
+  {
+    signal(sig, SIG_IGN);
+    siginterrupt(sig, 0);
+  }
+  else
+    siginterrupt(sig, (flags & 1) ? 0 : 1);
+#else
+  struct sigaction sa;
+  sigaction(sig, (struct sigaction *) 0, &sa);
+  if (!((flags & 2) && (sa.sa_handler==SIG_IGN)))
+  {
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags=(flags & 1) ? SA_RESTART : 0;
+    sa.sa_handler=sighandler;
+    sigaction(sig, &sa, (struct sigaction *) 0);
+  }
+#endif
+}
+
+static void cs_master_alarm()
+{
+  cs_log("PANIC: master deadlock!");
+  fprintf(stderr, "PANIC: master deadlock!");
+  fflush(stderr);
+}
+
+static void cs_sigpipe()
+{
+    if (cs_dblevel & D_ALL_DUMP)
+        cs_log("Got sigpipe signal -> captured");
+}
+
+/* Switch debuglevel forward one step (called when receiving SIGUSR1). */
+void cs_debug_level(){  
+    switch (cs_dblevel) {
+        case 0:
+            cs_dblevel = 1;
+            break;
+        case 128:
+            cs_dblevel = 255;
+            break;
+        case 255:
+            cs_dblevel = 0;
+            break;
+        default:
+            cs_dblevel <<= 1;
+    }
+
+    cs_log("debug_level=%d", cs_dblevel);
+}
+
+void cs_card_info()
+{
+  uchar dummy[1]={0x00};
+    struct s_client *cl;
+    for (cl=first_client->next; cl ; cl=cl->next)
+    if( cl->typ=='r' && cl->fd_m2c )
+      write_to_pipe(cl->fd_m2c, PIP_ID_CIN, dummy, 1);
+      //kill(client[i].pid, SIGUSR2);
+}
+
+/**
+ * called by signal SIGHUP
+ *
+ * reloads configs:
+ *  - useraccounts (oscam.user)
+ *  - services ids (oscam.srvid)
+ *  - tier ids     (oscam.tiers)
+ *  Also clears anticascading stats.
+ **/
+void cs_reload_config()
+{
+        cs_accounts_chk();
+        init_srvid();
+        init_tierid();
+        #ifdef CS_ANTICASC
+        ac_init_stat();
+        #endif
+}
+
+/* Sets signal handlers to ignore for early startup of OSCam because for example log 
+   could cause SIGPIPE errors and the normal signal handlers can't be used at this point. */
+static void init_signal_pre()
+{
+        set_signal_handler(SIGPIPE , 1, SIG_IGN);
+        set_signal_handler(SIGWINCH, 1, SIG_IGN);
+        set_signal_handler(SIGALRM , 1, SIG_IGN);
+        set_signal_handler(SIGHUP  , 1, SIG_IGN);
+}
+
+/* Sets the signal handlers.*/
+static void init_signal()
+{
+        set_signal_handler(SIGINT, 3, cs_exit);
+        //set_signal_handler(SIGKILL, 3, cs_exit);
+#ifdef OS_MACOSX
+        set_signal_handler(SIGEMT, 3, cs_exit);
+#else
+        //set_signal_handler(SIGPOLL, 3, cs_exit);
+#endif
+        //set_signal_handler(SIGPROF, 3, cs_exit);
+        set_signal_handler(SIGTERM, 3, cs_exit);
+        //set_signal_handler(SIGVTALRM, 3, cs_exit);
+
+        set_signal_handler(SIGWINCH, 1, SIG_IGN);
+        //  set_signal_handler(SIGPIPE , 0, SIG_IGN);
+        set_signal_handler(SIGPIPE , 0, cs_sigpipe);
+        //  set_signal_handler(SIGALRM , 0, cs_alarm);
+        set_signal_handler(SIGALRM , 0, cs_master_alarm);
+        // set_signal_handler(SIGCHLD , 1, cs_child_chk);
+        set_signal_handler(SIGHUP  , 1, cs_reload_config);
+        //set_signal_handler(SIGHUP , 1, cs_sighup);
+        set_signal_handler(SIGUSR1, 1, cs_debug_level);
+        set_signal_handler(SIGUSR2, 1, cs_card_info);
+        set_signal_handler(SIGCONT, 1, SIG_IGN);
+
+        if (cs_capture_SEGV)
+            set_signal_handler(SIGSEGV, 1, cs_exit);
+
+        cs_log("signal handling initialized (type=%s)",
+#ifdef CS_SIGBSD
+        "bsd"
+#else
+        "sysv"
+#endif
+        );
+    return;
 }
 
@@ -797 +876 @@
 }
 
-void cs_debug_level()
-{
-    //switch debuglevel forward one step if not set from outside
-    switch (cs_dblevel) {
-        case 0:
-            cs_dblevel = 1;
-            break;
-        case 128:
-            cs_dblevel = 255;
-            break;
-        case 255:
-            cs_dblevel = 0;
-            break;
-        default:
-            cs_dblevel <<= 1;
-    }
-
-    cs_log("%sdebug_level=%d", "all", cs_dblevel);
-}
-
-void cs_card_info()
-{
-  uchar dummy[1]={0x00};
-    struct s_client *cl;
-    for (cl=first_client->next; cl ; cl=cl->next)
-    if( cl->typ=='r' && cl->fd_m2c )
-      write_to_pipe(cl->fd_m2c, PIP_ID_CIN, dummy, 1);
-      //kill(client[i].pid, SIGUSR2);
-}
 
 struct s_client * create_client(in_addr_t ip) {
@@ -842 +892 @@
         //make_non_blocking(fdp[1]);
         cl->fd_m2c_c = fdp[0]; //store client read fd
-        cl->fd_m2c = fdp[1]; //store client read fd
+        cl->fd_m2c = fdp[1]; //store master write fd
         cl->ip=ip;
         cl->account = first_client->account;
@@ -867 +917 @@
 }
 
-/**
- * called by signal SIGHUB
- *
- * reloads configs:
- *  - useraccounts (oscom.user)
- *  - services ids (oscam.srvid)
- *  - tier ids     (oscam.tiers)
- **/
-void cs_reload_config()
-{
-        cs_accounts_chk();
-        init_srvid();
-        init_tierid();
-        #ifdef CS_ANTICASC
-        ac_init_stat();
-        #endif
-}
-
-static void init_signal_pre()
-{
-        set_signal_handler(SIGPIPE , 1, SIG_IGN);
-        set_signal_handler(SIGWINCH, 1, SIG_IGN);
-        set_signal_handler(SIGALRM , 1, SIG_IGN);
-        set_signal_handler(SIGHUP  , 1, SIG_IGN);
-}
-
-static void init_signal()
-{
-        set_signal_handler(SIGINT, 3, cs_exit);
-        //set_signal_handler(SIGKILL, 3, cs_exit);
-#ifdef OS_MACOSX
-        set_signal_handler(SIGEMT, 3, cs_exit);
-#else
-        //set_signal_handler(SIGPOLL, 3, cs_exit);
-#endif
-        //set_signal_handler(SIGPROF, 3, cs_exit);
-        set_signal_handler(SIGTERM, 3, cs_exit);
-        //set_signal_handler(SIGVTALRM, 3, cs_exit);
-
-        set_signal_handler(SIGWINCH, 1, SIG_IGN);
-        //  set_signal_handler(SIGPIPE , 0, SIG_IGN);
-        set_signal_handler(SIGPIPE , 0, cs_sigpipe);
-        //  set_signal_handler(SIGALRM , 0, cs_alarm);
-        set_signal_handler(SIGALRM , 0, cs_master_alarm);
-        // set_signal_handler(SIGCHLD , 1, cs_child_chk);
-        set_signal_handler(SIGHUP  , 1, cs_reload_config);
-        //set_signal_handler(SIGHUP , 1, cs_sighup);
-        set_signal_handler(SIGUSR1, 1, cs_debug_level);
-        set_signal_handler(SIGUSR2, 1, cs_card_info);
-        set_signal_handler(SIGCONT, 1, SIG_IGN);
-
-        if (cs_capture_SEGV)
-            set_signal_handler(SIGSEGV, 1, cs_exit);
-
-        cs_log("signal handling initialized (type=%s)",
-#ifdef CS_SIGBSD
-        "bsd"
-#else
-        "sysv"
-#endif
-        );
-    return;
-}
-
+
+/* Creates the master client of OSCam and inits some global variables/mutexes. */
 static void init_first_client()
 {
@@ -987 +975 @@
 }
 
+/* Checks if the date of the system is correct and waits if necessary. */
 static void init_check(){
     char *ptr = __DATE__;
@@ -1127 +1116 @@
 }
 
-int32_t cs_user_resolve(struct s_auth *account)
-{
+/* Resolves the ip of the hostname of the specified account and saves it in account->dynip.
+   If the hostname is not configured, the ip is set to 0. */
+void cs_user_resolve(struct s_auth *account){
     if (account->dyndns[0]){
         in_addr_t lastip = account->dynip;
@@ -1137 +1127 @@
         }
     } else account->dynip=0;
-    return account->dynip?1:0;
 }
 
@@ -1159 +1148 @@
 #pragma GCC diagnostic warning "-Wempty-body"
 
+/* Starts a thread named nameroutine with the start function startroutine. */
 void start_thread(void * startroutine, char * nameroutine) {
     pthread_t temp;
@@ -1177 +1167 @@
 }
 
-static void kill_thread_int(struct s_client *cl) { //cs_exit is used to let thread kill itself, this routine is for a thread to kill other thread
+/* Allows to kill another thread specified through the client cl without locking.
+  If the own thread has to be cancelled, cs_exit or cs_disconnect_client has to be used. */
+static void kill_thread_int(struct s_client *cl) {
 
     if (!cl) return;
@@ -1217 +1209 @@
 }
 
-void kill_thread(struct s_client *cl) { //cs_exit is used to let thread kill itself, this routine is for a thread to kill other thread
+/* Allows to kill another thread specified through the client cl with locking.
+  If the own thread has to be cancelled, cs_exit or cs_disconnect_client has to be used. */
+void kill_thread(struct s_client *cl) {
     cs_lock(&system_lock);
     kill_thread_int(cl);
     cs_unlock(&system_lock);
 }
-#ifdef CS_ANTICASC
-void start_anticascader()
-{
-  struct s_client * cl = create_client(first_client->ip);
-  if (cl == NULL) return;
-  cl->thread = pthread_self();
-  pthread_setspecific(getclient, cl);
-  cl->typ = 'a';
-
-  //set_signal_handler(SIGHUP, 1, ac_init_stat);
-  ac_init_stat();
-  while(1)
-  {
-    int32_t i;
-    for( i=0; i<cfg.ac_stime*60; i++ )
-        cs_sleepms(1000); //FIXME this is a cpu-killer!
-    ac_do_stat();
-  }
-}
-#endif
-
+
+/* Removes a reader from the list of active readers so that no ecms can be requested anymore. */
 void remove_reader_from_active(struct s_reader *rdr) {
     struct s_reader *rdr2, *prv = NULL;
@@ -1257 +1232 @@
 }
 
+/* Adds a reader to the list of active readers so that it can serve ecms. */
 void add_reader_to_active(struct s_reader *rdr) {
     struct s_reader *rdr2;
@@ -1268 +1244 @@
 }
 
+/* Starts or restarts a cardreader without locking. If restart=1, the existing thread is killed before restarting,
+   if restart=0 the cardreader is only started. */
 static int32_t restart_cardreader_int(struct s_reader *rdr, int32_t restart) {
 
@@ -1342 +1320 @@
 }
 
+/* Starts or restarts a cardreader with locking. If restart=1, the existing thread is killed before restarting,
+   if restart=0 the cardreader is only started. */
 int32_t restart_cardreader(struct s_reader *rdr, int32_t restart) {
     cs_lock(&system_lock);
@@ -1765 +1745 @@
 }
 
-/*
- * This function writes the current CW from ECM struct to a cwl file.
- * The filename is re-calculated and file re-opened every time.
- * This will consume a bit cpu time, but nothing has to be stored between
- * each call. If not file exists, a header is prepended
- */
-void logCWtoFile(ECM_REQUEST *er)
-{
-    FILE *pfCWL;
-    char srvname[128];
-    /* %s / %s   _I  %04X  _  %s  .cwl  */
-    char buf[256 + sizeof(srvname)];
-    char date[7];
-    unsigned char  i, parity, writeheader = 0;
-    time_t t;
-    struct tm timeinfo;
-
-    /*
-    * search service name for that id and change characters
-    * causing problems in file name
-    */
-
-    get_servicename(cur_client(), er->srvid, er->caid, srvname);
-
-    for (i = 0; srvname[i]; i++)
-        if (srvname[i] == ' ') srvname[i] = '_';
-
-    /* calc log file name */
-    time(&t);
-    localtime_r(&t, &timeinfo);
-    strftime(date, sizeof(date), "%Y%m%d", &timeinfo);
-    snprintf(buf, sizeof(buf), "%s/%s_I%04X_%s.cwl", cfg.cwlogdir, date, er->srvid, srvname);
-
-    /* open failed, assuming file does not exist, yet */
-    if((pfCWL = fopen(buf, "r")) == NULL) {
-        writeheader = 1;
-    } else {
-    /* we need to close the file if it was opened correctly */
-        fclose(pfCWL);
-    }
-
-    if ((pfCWL = fopen(buf, "a+")) == NULL) {
-        /* maybe this fails because the subdir does not exist. Is there a common function to create it?
-            for the moment do not print32_t to log on every ecm
-            cs_log(""error opening cw logfile for writing: %s (errno=%d %s)", buf, errno, strerror(errno)); */
-        return;
-    }
-    if (writeheader) {
-        /* no global macro for cardserver name :( */
-        fprintf(pfCWL, "# OSCam cardserver v%s - http://streamboard.gmc.to/oscam/\n", CS_VERSION_X);
-        fprintf(pfCWL, "# control word log file for use with tsdec offline decrypter\n");
-        strftime(buf, sizeof(buf),"DATE %Y-%m-%d, TIME %H:%M:%S, TZ %Z\n", &timeinfo);
-        fprintf(pfCWL, "# %s", buf);
-        fprintf(pfCWL, "# CAID 0x%04X, SID 0x%04X, SERVICE \"%s\"\n", er->caid, er->srvid, srvname);
-    }
-
-    parity = er->ecm[0]&1;
-    fprintf(pfCWL, "%d ", parity);
-    for (i = parity * 8; i < 8 + parity * 8; i++)
-        fprintf(pfCWL, "%02X ", er->cw[i]);
-    /* better use incoming time er->tps rather than current time? */
-    strftime(buf,sizeof(buf),"%H:%M:%S\n", &timeinfo);
-    fprintf(pfCWL, "# %s", buf);
-    fflush(pfCWL);
-    fclose(pfCWL);
-}
-
 /**
  * distributes found ecm-request to all clients with rc=99
@@ -1896 +1809 @@
   int32_t res=0;
   if( er->client && er->client->fd_m2c ) {
-    //Wie got an ECM (or nok). Now we should check for another clients waiting for it:
+    //We got an ECM (or nok). Now we should check for another clients waiting for it:
     res = write_ecm_request(er->client->fd_m2c, er);
   }
@@ -2733 +2646 @@
 }
 
-void log_emm_request(struct s_reader *rdr)
-{
-    cs_log("%s emm-request sent (reader=%s, caid=%04X, auprovid=%06lX)",
-            username(cur_client()), rdr->label, rdr->caid,
-            rdr->auprovid ? rdr->auprovid : b2i(4, rdr->prid[0]));
-}
-
 void do_emm(struct s_client * client, EMM_PACKET *ep)
 {
@@ -2876 +2782 @@
         write_to_pipe(aureader->fd, PIP_ID_EMM, (uchar *) ep, sizeof(EMM_PACKET));
     }
-}
-
-int32_t comp_timeb(struct timeb *tpa, struct timeb *tpb)
-{
-  if (tpa->time>tpb->time) return(1);
-  if (tpa->time<tpb->time) return(-1);
-  if (tpa->millitm>tpb->millitm) return(1);
-  if (tpa->millitm<tpb->millitm) return(-1);
-  return(0);
 }
 
@@ -3118 +3015 @@
 }
 
-void cs_log_config()
-{
-  uchar buf[20];
-
-  if (cfg.nice!=99)
-    snprintf((char *)buf, sizeof(buf), ", nice=%d", cfg.nice);
-  else
-    buf[0]='\0';
-  cs_log("version=%s, build #%s, system=%s-%s-%s%s", CS_VERSION_X, CS_SVN_VERSION, CS_OS_CPU, CS_OS_HW, CS_OS_SYS, buf);
-  cs_log("client max. idle=%d sec, debug level=%d", cfg.cmaxidle, cs_dblevel);
-
-  if( cfg.max_log_size )
-    snprintf((char *)buf, sizeof(buf), "%d Kb", cfg.max_log_size);
-  else
-    cs_strncpy((char *)buf, "unlimited", sizeof(buf));
-  cs_log("max. logsize=%s, loghistorysize=%d bytes", buf, cfg.loghistorysize);
-  cs_log("client timeout=%lu ms, fallback timeout=%lu ms, cache delay=%d ms",
-         cfg.ctimeout, cfg.ftimeout, cfg.delay);
-}
-
 void cs_waitforcardinit()
 {
@@ -3270 +3147 @@
     }
     return 0;
-}
-
-/**
- * get tmp dir
-  **/
-char * get_tmp_dir()
-{
-  if (cs_tmpdir[0])
-    return cs_tmpdir;
-
-#ifdef OS_CYGWIN32
-  char *d = getenv("TMPDIR");
-  if (!d || !d[0])
-    d = getenv("TMP");
-  if (!d || !d[0])
-    d = getenv("TEMP");
-  if (!d || !d[0])
-    getcwd(cs_tmpdir, sizeof(cs_tmpdir)-1);
-
-  cs_strncpy(cs_tmpdir, d, sizeof(cs_tmpdir));
-  char *p = cs_tmpdir;
-  while(*p) p++;
-  p--;
-  if (*p != '/' && *p != '\\')
-    strcat(cs_tmpdir, "/");
-  strcat(cs_tmpdir, "_oscam");
-#else
-  cs_strncpy(cs_tmpdir, "/tmp/.oscam", sizeof(cs_tmpdir));
-#endif
-  mkdir(cs_tmpdir, S_IRWXU);
-  return cs_tmpdir;
 }