Changeset 1701
Legend:
- Unmodified
- Added
- Removed
-
trunk/README
r1699 r1701 28 28 Enable features: 29 29 30 CS_ANTICASC - enable anti-cascading 31 CS_LOGHISTORY - enable log history 30 CS_ANTICASC - enable anti-cascading (default) 31 CS_LOGHISTORY - enable log history (default) 32 32 CS_WITH_GBOX - enable gbox support 33 33 HAVE_DVBAPI - enable DVB API support … … 36 36 Enable features with cmake: 37 37 38 -DCS_ANTICASC=1 - enable anti-cascading 39 -DCS_LOGHISTORY=1 - enable log history 38 -DCS_ANTICASC=1 - enable anti-cascading (default) 39 -DCS_LOGHISTORY=1 - enable log history (default) 40 40 -DCS_WITH_GBOX=1 - enable gbox support 41 41 -DHAVE_DVBAPI=1 - enable DVB API support -
trunk/globals.h
r1700 r1701 425 425 struct s_reader 426 426 { 427 int smargopatch; //FIXME workaround for Smargo until native mode works 427 428 int pid; 428 429 int cs_idx; … … 900 901 extern void chk_t_global(char *token, char *value); 901 902 extern void chk_t_monitor(char *token, char *value); 903 904 #ifdef HAVE_DVBAPI 902 905 extern void chk_t_dvbapi(char *token, char *value); 906 #endif 907 908 #ifdef WEBIF 909 extern void chk_t_webif(char *token, char *value); 910 #endif 911 903 912 extern void chk_account(char *token, char *value, struct s_auth *account); 904 913 extern void chk_sidtab(char *token, char *value, struct s_sidtab *sidtab); -
trunk/oscam-config.c
r1698 r1701 23 23 { 24 24 TAG_GLOBAL, // must be first ! 25 TAG_MONITOR, // monitor25 TAG_MONITOR, // monitor 26 26 TAG_CAMD33, // camd 3.3x 27 27 TAG_CAMD35, // camd 3.5x UDP 28 TAG_NEWCAMD, // newcamd29 TAG_RADEGAST, // radegast28 TAG_NEWCAMD, // newcamd 29 TAG_RADEGAST, // radegast 30 30 TAG_SERIAL, // serial (static) 31 31 TAG_CS357X, // camd 3.5x UDP … … 35 35 #endif 36 36 TAG_CCCAM, // cccam 37 TAG_DVBAPI 37 TAG_DVBAPI, // dvbapi 38 TAG_WEBIF // webif 38 39 #ifdef CS_ANTICASC 39 ,TAG_ANTICASC // anti-cascading40 ,TAG_ANTICASC // anti-cascading 40 41 #endif 41 42 } cs_proto_type_t; … … 46 47 "gbox", 47 48 #endif 48 "cccam", "dvbapi", 49 "cccam", "dvbapi", "webif", 49 50 #ifdef CS_ANTICASC 50 51 "anticasc", … … 620 621 } 621 622 623 if (!strcmp(token, "hideclient_to")) { 624 if(strlen(value) == 0) { 625 cfg->mon_hideclient_to = 0; 626 return; 627 } else { 628 cfg->mon_hideclient_to = atoi(value); 629 return; 630 } 631 } 632 633 if (token[0] != '#') 634 cs_log("Warning: keyword '%s' in monitor section not recognized",token); 635 } 636 622 637 #ifdef WEBIF 638 void chk_t_webif(char *token, char *value) 639 { 623 640 if (!strcmp(token, "httpport")) { 624 641 if(strlen(value) == 0) { … … 679 696 } 680 697 } 681 #endif682 683 if (!strcmp(token, "hideclient_to")) {684 if(strlen(value) == 0) {685 cfg->mon_hideclient_to = 0;686 return;687 } else {688 cfg->mon_hideclient_to = atoi(value);689 return;690 }691 }692 698 693 699 if (token[0] != '#') 694 cs_log("Warning: keyword '%s' in monitor section not recognized",token); 695 } 700 cs_log("Warning: keyword '%s' in webif section not recognized",token); 701 } 702 #endif 703 696 704 697 705 void chk_t_camd33(char *token, char *value) … … 1002 1010 { 1003 1011 if (!strcmp(token, "enabled")) { cfg->dvbapi_enabled=atoi(value); return; } 1004 if (!strcmp(token, "au")) 1012 if (!strcmp(token, "au")) { cfg->dvbapi_au=atoi(value); return; } 1005 1013 if (!strcmp(token, "boxtype")) { cs_strncpy(cfg->dvbapi_boxtype, value, sizeof(cfg->dvbapi_boxtype)); return; } 1006 1014 if (!strcmp(token, "user")) { cs_strncpy(cfg->dvbapi_usr, value, sizeof(cfg->dvbapi_usr)); return; } … … 1034 1042 case TAG_DVBAPI : fprintf(stderr, "Warning: OSCam compiled without DVB API support.\n"); break; 1035 1043 #endif 1044 1045 #ifdef WEBIF 1046 case TAG_WEBIF : chk_t_webif(token, value); break; 1047 #else 1048 case TAG_WEBIF : fprintf(stderr, "Warning: OSCam compiled without Webinterface support.\n"); break; 1049 #endif 1050 1036 1051 #ifdef CS_ANTICASC 1037 1052 case TAG_ANTICASC: chk_t_ac(token, value); break; … … 1496 1511 fprintf_conf(f, CONFVARWIDTH, "hideclient_to", "%d\n", cfg->mon_hideclient_to); 1497 1512 fprintf_conf(f, CONFVARWIDTH, "monlevel", "%d\n", cfg->mon_level); 1498 #ifdef WEBIF1499 fprintf_conf(f, CONFVARWIDTH, "httpport", "%d\n", cfg->http_port);1500 fprintf_conf(f, CONFVARWIDTH, "httpuser", "%s\n", cfg->http_user);1501 fprintf_conf(f, CONFVARWIDTH, "httppwd", "%s\n", cfg->http_pwd);1502 fprintf_conf(f, CONFVARWIDTH, "httpcss", "%s\n", cfg->http_css);1503 fprintf_conf(f, CONFVARWIDTH, "httpscript", "%s\n", cfg->http_script);1504 fprintf_conf(f, CONFVARWIDTH, "httprefresh", "%d\n", cfg->http_refresh);1505 fprintf_conf(f, CONFVARWIDTH, "httphideidleclients", "%d\n", cfg->http_hide_idle_clients);1506 #endif1507 1513 fputc((int)'\n', f); 1508 1514 … … 1654 1660 fprintf_conf(f, CONFVARWIDTH, "boxtype", "%s\n", cfg->dvbapi_boxtype); 1655 1661 fprintf_conf(f, CONFVARWIDTH, "user", "%s\n", cfg->dvbapi_usr); 1662 fputc((int)'\n', f); 1663 } 1664 #endif 1665 1666 #ifdef WEBIF 1667 /*webinterface*/ 1668 if (cfg->http_port > 0) { 1669 fprintf(f,"[webif]\n"); 1670 fprintf_conf(f, CONFVARWIDTH, "httpport", "%d\n", cfg->http_port); 1671 fprintf_conf(f, CONFVARWIDTH, "httpuser", "%s\n", cfg->http_user); 1672 fprintf_conf(f, CONFVARWIDTH, "httppwd", "%s\n", cfg->http_pwd); 1673 fprintf_conf(f, CONFVARWIDTH, "httpcss", "%s\n", cfg->http_css); 1674 fprintf_conf(f, CONFVARWIDTH, "httpscript", "%s\n", cfg->http_script); 1675 fprintf_conf(f, CONFVARWIDTH, "httprefresh", "%d\n", cfg->http_refresh); 1676 fprintf_conf(f, CONFVARWIDTH, "httphideidleclients", "%d\n", cfg->http_hide_idle_clients); 1656 1677 fputc((int)'\n', f); 1657 1678 }
Note:
See TracChangeset
for help on using the changeset viewer.