Changeset 4892
- Timestamp:
- 04/02/11 19:25:17 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-config.c
r4891 r4892 344 344 #ifdef QBOXHD_LED 345 345 if (!strcmp(token, "disableqboxhdled")) { 346 if (strlen(value) == 0) { 347 cfg.disableqboxhdled = 0; 348 return; 349 } else { 350 cfg.disableqboxhdled = atoi(value); 351 return; 352 } 346 cfg.disableqboxhdled = strToIntVal(value, 0); 347 return; 353 348 } 354 349 #endif … … 1355 1350 1356 1351 #ifdef WEBIF 1357 strcpy(cfg.http_user, ""); 1358 strcpy(cfg.http_pwd, ""); 1359 strcpy(cfg.http_css, ""); 1352 cs_strncpy(cfg.http_user, "", sizeof(cfg.http_user)); 1353 cs_strncpy(cfg.http_pwd, "", sizeof(cfg.http_pwd)); 1354 cs_strncpy(cfg.http_css, "", sizeof(cfg.http_css)); 1355 cs_strncpy(cfg.http_help_lang, "en", sizeof(cfg.http_help_lang)); 1360 1356 cfg.http_refresh = 0; 1361 1357 cfg.http_hide_idle_clients = 0; 1362 1358 cfg.mon_hideclient_to = 15; 1363 strcpy(cfg.http_tpl, "");1359 cs_strncpy(cfg.http_tpl, "", sizeof(cfg.http_tpl)); 1364 1360 #endif 1365 1361 cfg.ncd_keepalive = 1; … … 1371 1367 cfg.ac_denysamples = 8; 1372 1368 cfg.ac_fakedelay = 1000; 1373 strcpy(cfg.ac_logfile, "./oscam_ac.log");1369 cs_strncpy(cfg.ac_logfile, "./oscam_ac.log", sizeof(cfg.ac_logfile)); 1374 1370 #endif 1375 1371 #ifdef MODULE_CCCAM … … 1467 1463 1468 1464 if (!strcmp(token, "uniq")) { 1469 if(strlen(value) == 0) { 1470 account->uniq = 0; 1471 return; 1472 } else { 1473 account->uniq = atoi(value); 1474 return; 1475 } 1465 account->uniq = strToIntVal(value, 0); 1466 return; 1476 1467 } 1477 1468 1478 1469 if (!strcmp(token, "sleep")) { 1479 if(strlen(value) == 0) { 1480 account->tosleep = 0; 1481 return; 1482 } else { 1483 account->tosleep = atoi(value); 1484 return; 1485 } 1470 account->tosleep = strToIntVal(value, cfg.tosleep); 1471 return; 1486 1472 } 1487 1473 1488 1474 if (!strcmp(token, "sleepsend")) { 1489 if(strlen(value) == 0) { 1490 account->c35_sleepsend = 0; 1491 return; 1492 } else { 1493 account->c35_sleepsend = atoi(value); 1494 if (account->c35_sleepsend > 0xFF) 1495 account->c35_sleepsend = 0xFF; 1496 return; 1497 } 1475 account->c35_sleepsend = strToIntVal(value, 0); 1476 if (account->c35_sleepsend > 0xFF) 1477 account->c35_sleepsend = 0xFF; 1478 return; 1498 1479 } 1499 1480 1500 1481 if (!strcmp(token, "monlevel")) { 1501 if(strlen(value) == 0) { 1502 account->monlvl = 0; 1503 return; 1504 } else { 1505 account->monlvl = atoi(value); 1506 return; 1507 } 1482 account->monlvl = strToIntVal(value, 0); 1483 return; 1508 1484 } 1509 1485 … … 1519 1495 1520 1496 if (!strcmp(token, "disabled")) { 1521 if(strlen(value) == 0) { 1522 account->disabled = 0; 1523 return; 1524 } else { 1525 account->disabled = atoi(value); 1526 return; 1527 } 1497 account->disabled = strToIntVal(value, 0); 1498 return; 1528 1499 } 1529 1500 1530 1501 if (!strcmp(token, "suppresscmd08")) { 1531 if(strlen(value) == 0) { 1532 account->c35_suppresscmd08 = 0; 1533 return; 1534 } else { 1535 account->c35_suppresscmd08=atoi(value); 1536 return; 1537 } 1502 account->c35_suppresscmd08 = strToIntVal(value, 0); 1503 return; 1538 1504 } 1539 1505 1540 1506 if (!strcmp(token, "cccmaxhops")) { 1541 if (strlen(value) == 0) { 1542 account->cccmaxhops = 10; 1543 return; 1544 } else { 1545 account->cccmaxhops = atoi(value); 1546 return; 1547 } 1507 account->cccmaxhops = strToIntVal(value, 10); 1508 return; 1548 1509 } 1549 1510 1550 1511 if (!strcmp(token, "cccreshare")) { 1551 if (strlen(value) == 0) { 1552 account->cccreshare = 0; 1553 return; 1554 } else { 1555 account->cccreshare = atoi(value); 1556 return; 1557 } 1512 account->cccreshare = strToIntVal(value, 0); 1513 return; 1558 1514 } 1559 1515 1560 1516 if (!strcmp(token, "cccignorereshare")) { 1561 if (strlen(value) == 0) { 1562 account->cccignorereshare = 0; 1563 return; 1564 } else { 1565 account->cccignorereshare = atoi(value); 1566 return; 1567 } 1517 account->cccignorereshare = strToIntVal(value, 0); 1518 return; 1568 1519 } 1569 1520 1570 1521 if (!strcmp(token, "keepalive")) { 1571 if(strlen(value) == 0) { 1572 account->ncd_keepalive = 1; 1573 return; 1574 } else { 1575 account->ncd_keepalive = atoi(value); 1576 return; 1577 } 1522 account->ncd_keepalive = strToIntVal(value, 1); 1523 return; 1578 1524 } 1579 1525 /* … … 1676 1622 1677 1623 if (!strcmp(token, "failban")) { 1678 if(strlen(value) == 0) { 1679 account->failban = 0; 1680 return; 1681 } else { 1682 account->failban = atoi(value); 1683 return; 1684 } 1624 account->failban = strToIntVal(value, 0); 1625 return; 1685 1626 } 1686 1627 1687 1628 #ifdef CS_ANTICASC 1688 1629 if( !strcmp(token, "numusers") ) { 1689 account->ac_users = atoi(value);1630 account->ac_users = strToIntVal(value, 0); 1690 1631 return; 1691 1632 } 1692 1633 1693 1634 if( !strcmp(token, "penalty") ) { 1694 account->ac_penalty = atoi(value);1635 account->ac_penalty = strToIntVal(value, 0); 1695 1636 return; 1696 1637 } … … 1777 1718 /*global settings*/ 1778 1719 fprintf(f,"[global]\n"); 1779 if (cfg.srvip != 0 || (cfg.srvip == 0 && cfg.http_full_cfg))1720 if (cfg.srvip != 0 || cfg.http_full_cfg) 1780 1721 fprintf_conf(f, CONFVARWIDTH, "serverip", "%s\n", cs_inet_ntoa(cfg.srvip)); 1781 if (cfg.usrfile != NULL || (cfg.usrfile == NULL && cfg.http_full_cfg))1722 if (cfg.usrfile != NULL || cfg.http_full_cfg) 1782 1723 fprintf_conf(f, CONFVARWIDTH, "usrfile", "%s\n", cfg.usrfile); 1783 if (cfg.logfile != NULL || cfg.logtostdout == 1 || cfg.logtosyslog == 1 || (cfg.logfile == NULL && cfg.http_full_cfg)){1724 if (cfg.logfile != NULL || cfg.logtostdout == 1 || cfg.logtosyslog == 1 || cfg.http_full_cfg){ 1784 1725 value = mk_t_logfile(); 1785 1726 fprintf_conf(f, CONFVARWIDTH, "logfile", "%s\n", value); 1786 1727 free(value); 1787 1728 } 1788 if (cfg.cwlogdir != NULL || (cfg.cwlogdir == NULL && cfg.http_full_cfg))1729 if (cfg.cwlogdir != NULL || cfg.http_full_cfg) 1789 1730 fprintf_conf(f, CONFVARWIDTH, "cwlogdir", "%s\n", cfg.cwlogdir); 1790 1731 #ifdef QBOXHD_LED 1791 if (cfg.disableqboxhdled || (!cfg.disableqboxhdled && cfg.http_full_cfg))1732 if (cfg.disableqboxhdled || cfg.http_full_cfg) 1792 1733 fprintf_conf(f, CONFVARWIDTH, "disableqboxhdled", "%d\n", cfg.disableqboxhdled); 1793 1734 #endif 1794 if (cfg.disablelog || (!cfg.disablelog && cfg.http_full_cfg))1735 if (cfg.disablelog || cfg.http_full_cfg) 1795 1736 fprintf_conf(f, CONFVARWIDTH, "disablelog", "%d\n", cfg.disablelog); 1796 if (cfg.disableuserfile || (!cfg.disableuserfile && cfg.http_full_cfg))1737 if (cfg.disableuserfile || cfg.http_full_cfg) 1797 1738 fprintf_conf(f, CONFVARWIDTH, "disableuserfile", "%d\n", cfg.disableuserfile); 1798 if (cfg.usrfileflag || (!cfg.usrfileflag && cfg.http_full_cfg))1739 if (cfg.usrfileflag || cfg.http_full_cfg) 1799 1740 fprintf_conf(f, CONFVARWIDTH, "usrfileflag", "%d\n", cfg.usrfileflag); 1800 if (cfg.ctimeout != CS_CLIENT_TIMEOUT || (cfg.ctimeout != CS_CLIENT_TIMEOUT && cfg.http_full_cfg))1741 if (cfg.ctimeout != CS_CLIENT_TIMEOUT || cfg.http_full_cfg) 1801 1742 fprintf_conf(f, CONFVARWIDTH, "clienttimeout", "%ld\n", cfg.ctimeout); 1802 if ((cfg.ftimeout && cfg.ftimeout != (CS_CLIENT_TIMEOUT /2)) || ((!cfg.ftimeout || cfg.ftimeout == (CS_CLIENT_TIMEOUT /2)) && cfg.http_full_cfg))1743 if ((cfg.ftimeout && cfg.ftimeout != (CS_CLIENT_TIMEOUT /2)) || cfg.http_full_cfg) 1803 1744 fprintf_conf(f, CONFVARWIDTH, "fallbacktimeout", "%ld\n", cfg.ftimeout); 1804 if (cfg.cmaxidle != CS_CLIENT_MAXIDLE || (cfg.cmaxidle == CS_CLIENT_MAXIDLE && cfg.http_full_cfg))1745 if (cfg.cmaxidle != CS_CLIENT_MAXIDLE || cfg.http_full_cfg) 1805 1746 fprintf_conf(f, CONFVARWIDTH, "clientmaxidle", "%d\n", cfg.cmaxidle); 1806 if (cfg.failbantime || (!cfg.failbantime && cfg.http_full_cfg))1747 if (cfg.failbantime || cfg.http_full_cfg) 1807 1748 fprintf_conf(f, CONFVARWIDTH, "failbantime", "%d\n", cfg.failbantime); 1808 if (cfg.failbancount || (!cfg.failbancount && cfg.http_full_cfg))1749 if (cfg.failbancount || cfg.http_full_cfg) 1809 1750 fprintf_conf(f, CONFVARWIDTH, "failbancount", "%d\n", cfg.failbancount); 1810 if (cfg.delay != CS_DELAY || (cfg.delay == CS_DELAY && cfg.http_full_cfg))1751 if (cfg.delay != CS_DELAY || cfg.http_full_cfg) 1811 1752 fprintf_conf(f, CONFVARWIDTH, "cachedelay", "%ld\n", cfg.delay); //deprecated 1812 if (cfg.bindwait != CS_BIND_TIMEOUT || (cfg.bindwait != CS_BIND_TIMEOUT && cfg.http_full_cfg))1753 if (cfg.bindwait != CS_BIND_TIMEOUT || cfg.http_full_cfg) 1813 1754 fprintf_conf(f, CONFVARWIDTH, "bindwait", "%d\n", cfg.bindwait); 1814 if (cfg.netprio || (!cfg.netprio && cfg.http_full_cfg))1755 if (cfg.netprio || cfg.http_full_cfg) 1815 1756 fprintf_conf(f, CONFVARWIDTH, "netprio", "%ld\n", cfg.netprio); 1816 if (cfg.tosleep || (!cfg.tosleep && cfg.http_full_cfg))1757 if (cfg.tosleep || cfg.http_full_cfg) 1817 1758 fprintf_conf(f, CONFVARWIDTH, "sleep", "%d\n", cfg.tosleep); 1818 if (cfg.ulparent || (!cfg.ulparent && cfg.http_full_cfg))1759 if (cfg.ulparent || cfg.http_full_cfg) 1819 1760 fprintf_conf(f, CONFVARWIDTH, "unlockparental", "%d\n", cfg.ulparent); 1820 if (cfg.nice != 99 || (cfg.nice == 99 && cfg.http_full_cfg))1761 if (cfg.nice != 99 || cfg.http_full_cfg) 1821 1762 fprintf_conf(f, CONFVARWIDTH, "nice", "%d\n", cfg.nice); 1822 if (cfg.srtimeout != 1500 || (cfg.srtimeout == 1500 && cfg.http_full_cfg))1763 if (cfg.srtimeout != 1500 || cfg.http_full_cfg) 1823 1764 fprintf_conf(f, CONFVARWIDTH, "serialreadertimeout", "%d\n", cfg.srtimeout); 1824 if (cfg.max_log_size != 10 || (cfg.max_log_size == 10 && cfg.http_full_cfg))1765 if (cfg.max_log_size != 10 || cfg.http_full_cfg) 1825 1766 fprintf_conf(f, CONFVARWIDTH, "maxlogsize", "%d\n", cfg.max_log_size); 1826 if (!cfg.waitforcards || (cfg.waitforcards && cfg.http_full_cfg))1767 if (!cfg.waitforcards || cfg.http_full_cfg) 1827 1768 fprintf_conf(f, CONFVARWIDTH, "waitforcards", "%d\n", cfg.waitforcards); 1828 if (cfg.preferlocalcards || (!cfg.preferlocalcards && cfg.http_full_cfg))1769 if (cfg.preferlocalcards || cfg.http_full_cfg) 1829 1770 fprintf_conf(f, CONFVARWIDTH, "preferlocalcards", "%d\n", cfg.preferlocalcards); 1830 if (cfg.saveinithistory || (!cfg.saveinithistory && cfg.http_full_cfg))1771 if (cfg.saveinithistory || cfg.http_full_cfg) 1831 1772 fprintf_conf(f, CONFVARWIDTH, "saveinithistory", "%d\n", cfg.saveinithistory); 1832 if (cfg.reader_restart_seconds != 5 || (cfg.reader_restart_seconds == 5 && cfg.http_full_cfg))1773 if (cfg.reader_restart_seconds != 5 || cfg.http_full_cfg) 1833 1774 fprintf_conf(f, CONFVARWIDTH, "readerrestartseconds", "%d\n", cfg.reader_restart_seconds); 1834 1775 if (cfg.dropdups || cfg.http_full_cfg) 1835 1776 fprintf_conf(f, CONFVARWIDTH, "dropdups", "%d\n", cfg.dropdups); 1836 1777 1837 if (cfg.lb_mode || (!cfg.lb_mode && cfg.http_full_cfg))1778 if (cfg.lb_mode || cfg.http_full_cfg) 1838 1779 fprintf_conf(f, CONFVARWIDTH, "lb_mode", "%d\n", cfg.lb_mode); 1839 if (cfg.lb_save || (!cfg.lb_save && cfg.http_full_cfg))1780 if (cfg.lb_save || cfg.http_full_cfg) 1840 1781 fprintf_conf(f, CONFVARWIDTH, "lb_save", "%d\n", cfg.lb_save); 1841 if (cfg.lb_nbest_readers != DEFAULT_NBEST || (cfg.lb_nbest_readers == DEFAULT_NBEST && cfg.http_full_cfg))1782 if (cfg.lb_nbest_readers != DEFAULT_NBEST || cfg.http_full_cfg) 1842 1783 fprintf_conf(f, CONFVARWIDTH, "lb_nbest_readers", "%d\n", cfg.lb_nbest_readers); 1843 if (cfg.lb_nfb_readers != DEFAULT_NFB || (cfg.lb_nfb_readers == DEFAULT_NFB && cfg.http_full_cfg))1784 if (cfg.lb_nfb_readers != DEFAULT_NFB || cfg.http_full_cfg) 1844 1785 fprintf_conf(f, CONFVARWIDTH, "lb_nfb_readers", "%d\n", cfg.lb_nfb_readers); 1845 if (cfg.lb_min_ecmcount != DEFAULT_MIN_ECM_COUNT || (cfg.lb_min_ecmcount == DEFAULT_MIN_ECM_COUNT && cfg.http_full_cfg))1786 if (cfg.lb_min_ecmcount != DEFAULT_MIN_ECM_COUNT || cfg.http_full_cfg) 1846 1787 fprintf_conf(f, CONFVARWIDTH, "lb_min_ecmcount", "%d\n", cfg.lb_min_ecmcount); 1847 if (cfg.lb_max_ecmcount != DEFAULT_MAX_ECM_COUNT || (cfg.lb_max_ecmcount == DEFAULT_MAX_ECM_COUNT && cfg.http_full_cfg))1788 if (cfg.lb_max_ecmcount != DEFAULT_MAX_ECM_COUNT || cfg.http_full_cfg) 1848 1789 fprintf_conf(f, CONFVARWIDTH, "lb_max_ecmcount", "%d\n", cfg.lb_max_ecmcount); 1849 if (cfg.lb_reopen_seconds != DEFAULT_REOPEN_SECONDS || (cfg.lb_reopen_seconds == DEFAULT_REOPEN_SECONDS && cfg.http_full_cfg))1790 if (cfg.lb_reopen_seconds != DEFAULT_REOPEN_SECONDS || cfg.http_full_cfg) 1850 1791 fprintf_conf(f, CONFVARWIDTH, "lb_reopen_seconds", "%d\n", cfg.lb_reopen_seconds); 1851 1792 if (cfg.lb_retrylimit != DEFAULT_RETRYLIMIT || cfg.http_full_cfg) 1852 1793 fprintf_conf(f, CONFVARWIDTH, "lb_retrylimit", "%d\n", cfg.lb_retrylimit); 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1794 if (cfg.lb_retrylimittab.n > 0 || cfg.http_full_cfg) { 1795 char *value = mk_t_caidvaluetab(&cfg.lb_retrylimittab); 1796 fprintf_conf(f, CONFVARWIDTH, "lb_retrylimits", "%s\n", value); 1797 free(value); 1798 } 1799 if (cfg.lb_nbest_readers_tab.n > 0 || cfg.http_full_cfg) { 1800 char *value = mk_t_caidvaluetab(&cfg.lb_nbest_readers_tab); 1801 fprintf_conf(f, CONFVARWIDTH, "lb_nbest_percaid", "%s\n", value); 1802 free(value); 1803 } 1804 1805 if (cfg.lb_noproviderforcaid.caid[0] || cfg.http_full_cfg) { 1806 value = mk_t_caidtab(&cfg.lb_noproviderforcaid); 1807 fprintf_conf(f, CONFVARWIDTH, "lb_noproviderforcaid", "%s\n", value); 1808 free(value); 1809 } 1869 1810 1870 if (cfg.lb_savepath )1811 if (cfg.lb_savepath || cfg.http_full_cfg) 1871 1812 fprintf_conf(f, CONFVARWIDTH, "lb_savepath", "%s\n", cfg.lb_savepath); 1872 1813 if (cfg.lb_stat_cleanup != DEFAULT_LB_STAT_CLEANUP || cfg.http_full_cfg) … … 1875 1816 fprintf_conf(f, CONFVARWIDTH, "lb_use_locking", "%d\n", cfg.lb_use_locking); 1876 1817 1877 if (cfg.resolve_gethostbyname || (!cfg.resolve_gethostbyname && cfg.http_full_cfg))1818 if (cfg.resolve_gethostbyname || cfg.http_full_cfg) 1878 1819 fprintf_conf(f, CONFVARWIDTH, "resolvegethostbyname", "%d\n", cfg.resolve_gethostbyname); 1879 1820 … … 1886 1827 1887 1828 /*monitor settings*/ 1888 if(cfg.mon_port || cfg.mon_appendchaninfo || cfg.mon_hideclient_to ) {1829 if(cfg.mon_port || cfg.mon_appendchaninfo || cfg.mon_hideclient_to != 0 || cfg.mon_aulow != 30) { 1889 1830 fprintf(f,"[monitor]\n"); 1890 1831 fprintf_conf(f, CONFVARWIDTH, "port", "%d\n", cfg.mon_port); … … 1900 1841 } 1901 1842 fputc((int)'\n', f); 1902 fprintf_conf(f, CONFVARWIDTH, "aulow", "%d\n", cfg.mon_aulow); 1903 fprintf_conf(f, CONFVARWIDTH, "hideclient_to", "%d\n", cfg.mon_hideclient_to); 1904 fprintf_conf(f, CONFVARWIDTH, "monlevel", "%d\n", cfg.mon_level); 1905 fprintf_conf(f, CONFVARWIDTH, "appendchaninfo", "%d\n", cfg.mon_appendchaninfo); 1843 if(cfg.mon_aulow != 30 || cfg.http_full_cfg) 1844 fprintf_conf(f, CONFVARWIDTH, "aulow", "%d\n", cfg.mon_aulow); 1845 if(cfg.mon_hideclient_to != 0 || cfg.http_full_cfg) 1846 fprintf_conf(f, CONFVARWIDTH, "hideclient_to", "%d\n", cfg.mon_hideclient_to); 1847 if(cfg.mon_level != 2 || cfg.http_full_cfg) 1848 fprintf_conf(f, CONFVARWIDTH, "monlevel", "%d\n", cfg.mon_level); 1849 if(cfg.mon_appendchaninfo != 2 || cfg.http_full_cfg) 1850 fprintf_conf(f, CONFVARWIDTH, "appendchaninfo", "%d\n", cfg.mon_appendchaninfo); 1906 1851 fputc((int)'\n', f); 1907 1852 } … … 1930 1875 } 1931 1876 fprintf(f,"\n"); 1932 fprintf_conf(f, CONFVARWIDTH, "keepalive", "%d\n", cfg.ncd_keepalive); 1933 fprintf_conf(f, CONFVARWIDTH, "mgclient", "%d\n", cfg.ncd_mgclient); 1877 if(cfg.ncd_keepalive != 1 || cfg.http_full_cfg) 1878 fprintf_conf(f, CONFVARWIDTH, "keepalive", "%d\n", cfg.ncd_keepalive); 1879 if(cfg.ncd_mgclient != 0 || cfg.http_full_cfg) 1880 fprintf_conf(f, CONFVARWIDTH, "mgclient", "%d\n", cfg.ncd_mgclient); 1934 1881 fprintf(f,"\n"); 1935 1882 } … … 1941 1888 if (cfg.c33_srvip != 0) 1942 1889 fprintf_conf(f, CONFVARWIDTH, "serverip", "%s\n", cs_inet_ntoa(cfg.c33_srvip)); 1943 fprintf_conf(f, CONFVARWIDTH, "passive", "%d\n", cfg.c33_passive); 1890 if(cfg.c33_passive != 0 || cfg.http_full_cfg) 1891 fprintf_conf(f, CONFVARWIDTH, "passive", "%d\n", cfg.c33_passive); 1944 1892 fprintf_conf(f, CONFVARWIDTH, "key", ""); for (i = 0; i < (int) sizeof(cfg.c33_key); ++i) fprintf(f,"%02X", cfg.c33_key[i]); fputc((int)'\n', f); 1945 1893 fprintf_conf(f, CONFVARWIDTH, "nocrypt", ""); … … 2026 1974 fprintf(f,"[cccam]\n"); 2027 1975 fprintf_conf(f, CONFVARWIDTH, "port", "%d\n", cfg.cc_port); 2028 fprintf_conf(f, CONFVARWIDTH, "reshare", "%d\n", cfg.cc_reshare); 2029 fprintf_conf(f, CONFVARWIDTH, "ignorereshare", "%d\n", cfg.cc_ignore_reshare); 2030 fprintf_conf(f, CONFVARWIDTH, "forward_origin_card", "%d\n", cfg.cc_forward_origin_card); 2031 fprintf_conf(f, CONFVARWIDTH, "version", "%s\n", cfg.cc_version); 2032 fprintf_conf(f, CONFVARWIDTH, "updateinterval", "%d\n", cfg.cc_update_interval); 2033 fprintf_conf(f, CONFVARWIDTH, "minimizecards", "%d\n", cfg.cc_minimize_cards); 2034 fprintf_conf(f, CONFVARWIDTH, "keepconnected", "%d\n", cfg.cc_keep_connected); 2035 fprintf_conf(f, CONFVARWIDTH, "stealth", "%d\n", cfg.cc_stealth); 2036 fprintf_conf(f, CONFVARWIDTH, "reshare_mode", "%d\n", cfg.cc_reshare_services); 1976 if(cfg.cc_reshare != 10 || cfg.http_full_cfg) 1977 fprintf_conf(f, CONFVARWIDTH, "reshare", "%d\n", cfg.cc_reshare); 1978 if(cfg.cc_ignore_reshare != 0 || cfg.http_full_cfg) 1979 fprintf_conf(f, CONFVARWIDTH, "ignorereshare", "%d\n", cfg.cc_ignore_reshare); 1980 if(cfg.cc_forward_origin_card != 0 || cfg.http_full_cfg) 1981 fprintf_conf(f, CONFVARWIDTH, "forward_origin_card", "%d\n", cfg.cc_forward_origin_card); 1982 if(cfg.cc_version || cfg.http_full_cfg) 1983 fprintf_conf(f, CONFVARWIDTH, "version", "%s\n", cfg.cc_version); 1984 if(cfg.cc_update_interval != DEFAULT_UPDATEINTERVAL || cfg.http_full_cfg) 1985 fprintf_conf(f, CONFVARWIDTH, "updateinterval", "%d\n", cfg.cc_update_interval); 1986 if(cfg.cc_minimize_cards != 0 || cfg.http_full_cfg) 1987 fprintf_conf(f, CONFVARWIDTH, "minimizecards", "%d\n", cfg.cc_minimize_cards); 1988 if(cfg.cc_keep_connected != 1 || cfg.http_full_cfg) 1989 fprintf_conf(f, CONFVARWIDTH, "keepconnected", "%d\n", cfg.cc_keep_connected); 1990 if(cfg.cc_stealth != 0 || cfg.http_full_cfg) 1991 fprintf_conf(f, CONFVARWIDTH, "stealth", "%d\n", cfg.cc_stealth); 1992 if(cfg.cc_reshare_services != 0 || cfg.http_full_cfg) 1993 fprintf_conf(f, CONFVARWIDTH, "reshare_mode", "%d\n", cfg.cc_reshare_services); 2037 1994 fprintf(f,"\n"); 2038 1995 } … … 2043 2000 fprintf(f,"[dvbapi]\n"); 2044 2001 fprintf_conf(f, CONFVARWIDTH, "enabled", "%d\n", cfg.dvbapi_enabled); 2045 fprintf_conf(f, CONFVARWIDTH, "au", "%d\n", cfg.dvbapi_au); 2002 if(cfg.dvbapi_au != 0 || cfg.http_full_cfg) 2003 fprintf_conf(f, CONFVARWIDTH, "au", "%d\n", cfg.dvbapi_au); 2046 2004 fprintf_conf(f, CONFVARWIDTH, "boxtype", "%s\n", boxdesc[cfg.dvbapi_boxtype]); 2047 2005 fprintf_conf(f, CONFVARWIDTH, "user", "%s\n", cfg.dvbapi_usr); 2048 fprintf_conf(f, CONFVARWIDTH, "pmt_mode", "%d\n", cfg.dvbapi_pmtmode); 2049 fprintf_conf(f, CONFVARWIDTH, "request_mode", "%d\n", cfg.dvbapi_requestmode); 2006 if(cfg.pmt_mode != 0 || cfg.http_full_cfg) 2007 fprintf_conf(f, CONFVARWIDTH, "pmt_mode", "%d\n", cfg.dvbapi_pmtmode); 2008 if(cfg.dvbapi_requestmode != 0 || cfg.http_full_cfg) 2009 fprintf_conf(f, CONFVARWIDTH, "request_mode", "%d\n", cfg.dvbapi_requestmode); 2050 2010 2051 2011 fputc((int)'\n', f); … … 2063 2023 } 2064 2024 2065 if(str len(cfg.http_help_lang) > 0)2025 if(strcmp(cfg.http_help_lang, "en") != 0 || cfg.http_full_cfg) 2066 2026 fprintf_conf(f, CONFVARWIDTH, "httphelplang", "%s\n", cfg.http_help_lang); 2067 if(strlen(cfg.http_user) > 0 )2027 if(strlen(cfg.http_user) > 0 || cfg.http_full_cfg) 2068 2028 fprintf_conf(f, CONFVARWIDTH, "httpuser", "%s\n", cfg.http_user); 2069 if(strlen(cfg.http_pwd) > 0 )2029 if(strlen(cfg.http_pwd) > 0 || cfg.http_full_cfg) 2070 2030 fprintf_conf(f, CONFVARWIDTH, "httppwd", "%s\n", cfg.http_pwd); 2071 if(strlen(cfg.http_cert) > 0 )2031 if(strlen(cfg.http_cert) > 0 || cfg.http_full_cfg) 2072 2032 fprintf_conf(f, CONFVARWIDTH, "httpcert", "%s\n", cfg.http_cert); 2073 if(strlen(cfg.http_css) > 0 )2033 if(strlen(cfg.http_css) > 0 || cfg.http_full_cfg) 2074 2034 fprintf_conf(f, CONFVARWIDTH, "httpcss", "%s\n", cfg.http_css); 2075 if(strlen(cfg.http_jscript) > 0 )2035 if(strlen(cfg.http_jscript) > 0 || cfg.http_full_cfg) 2076 2036 fprintf_conf(f, CONFVARWIDTH, "httpjscript", "%s\n", cfg.http_jscript); 2077 if(strlen(cfg.http_tpl) > 0 )2037 if(strlen(cfg.http_tpl) > 0 || cfg.http_full_cfg) 2078 2038 fprintf_conf(f, CONFVARWIDTH, "httptpl", "%s\n", cfg.http_tpl); 2079 if(strlen(cfg.http_script) > 0 )2039 if(strlen(cfg.http_script) > 0 || cfg.http_full_cfg) 2080 2040 fprintf_conf(f, CONFVARWIDTH, "httpscript", "%s\n", cfg.http_script); 2081 fprintf_conf(f, CONFVARWIDTH, "httprefresh", "%d\n", cfg.http_refresh); 2041 if(cfg.http_refresh > 0 || cfg.http_full_cfg) 2042 fprintf_conf(f, CONFVARWIDTH, "httprefresh", "%d\n", cfg.http_refresh); 2082 2043 fprintf_conf(f, CONFVARWIDTH, "httpallowed", ""); 2083 2044 struct s_ip *cip; … … 2089 2050 } 2090 2051 fputc((int)'\n', f); 2091 if(strlen((const char *) (cfg.http_dyndns)) > 0 )2052 if(strlen((const char *) (cfg.http_dyndns)) > 0 || cfg.http_full_cfg) 2092 2053 fprintf_conf(f, CONFVARWIDTH, "httpdyndns", "%s\n", cfg.http_dyndns); 2093 fprintf_conf(f, CONFVARWIDTH, "httphideidleclients", "%d\n", cfg.http_hide_idle_clients); 2094 fprintf_conf(f, CONFVARWIDTH, "httpreadonly", "%d\n", cfg.http_readonly); 2095 fprintf_conf(f, CONFVARWIDTH, "httpsavefullcfg", "%d\n", cfg.http_full_cfg); 2054 if(cfg.http_hide_idle_clients || cfg.http_full_cfg) 2055 fprintf_conf(f, CONFVARWIDTH, "httphideidleclients", "%d\n", cfg.http_hide_idle_clients); 2056 if(cfg.http_readonly || cfg.http_full_cfg) 2057 fprintf_conf(f, CONFVARWIDTH, "httpreadonly", "%d\n", cfg.http_readonly); 2058 if(cfg.http_full_cfg) 2059 fprintf_conf(f, CONFVARWIDTH, "httpsavefullcfg", "%d\n", cfg.http_full_cfg); 2096 2060 2097 2061 fputc((int)'\n', f); … … 2103 2067 fprintf(f,"[anticasc]\n"); 2104 2068 fprintf_conf(f, CONFVARWIDTH, "enabled", "%d\n", cfg.ac_enabled); 2105 fprintf_conf(f, CONFVARWIDTH, "numusers", "%d\n", cfg.ac_users); 2106 fprintf_conf(f, CONFVARWIDTH, "sampletime", "%d\n", cfg.ac_stime); 2107 fprintf_conf(f, CONFVARWIDTH, "samples", "%d\n", cfg.ac_samples); 2108 fprintf_conf(f, CONFVARWIDTH, "penalty", "%d\n", cfg.ac_penalty); 2109 fprintf_conf(f, CONFVARWIDTH, "aclogfile", "%s\n", cfg.ac_logfile); 2110 fprintf_conf(f, CONFVARWIDTH, "denysamples", "%d\n", cfg.ac_denysamples); 2111 fprintf_conf(f, CONFVARWIDTH, "fakedelay", "%d\n", cfg.ac_fakedelay); 2069 if(cfg.ac_users != 0 || cfg.http_full_cfg) 2070 fprintf_conf(f, CONFVARWIDTH, "numusers", "%d\n", cfg.ac_users); 2071 if(cfg.ac_stime != 2 || cfg.http_full_cfg) 2072 fprintf_conf(f, CONFVARWIDTH, "sampletime", "%d\n", cfg.ac_stime); 2073 if(cfg.ac_samples != 10 || cfg.http_full_cfg) 2074 fprintf_conf(f, CONFVARWIDTH, "samples", "%d\n", cfg.ac_samples); 2075 if(cfg.ac_penalty != 0 || cfg.http_full_cfg) 2076 fprintf_conf(f, CONFVARWIDTH, "penalty", "%d\n", cfg.ac_penalty); 2077 if(cfg.ac_logfile || cfg.http_full_cfg) 2078 fprintf_conf(f, CONFVARWIDTH, "aclogfile", "%s\n", cfg.ac_logfile); 2079 if(cfg.ac_denysamples != 8 || cfg.http_full_cfg) 2080 fprintf_conf(f, CONFVARWIDTH, "denysamples", "%d\n", cfg.ac_denysamples); 2081 if(cfg.ac_fakedelay != 1000 || cfg.http_full_cfg) 2082 fprintf_conf(f, CONFVARWIDTH, "fakedelay", "%d\n", cfg.ac_fakedelay); 2112 2083 fputc((int)'\n', f); 2113 2084 } … … 2145 2116 fprintf_conf(f, CONFVARWIDTH, "pwd", "%s\n", account->pwd); 2146 2117 #ifdef WEBIF 2147 if (account->description[0] )2118 if (account->description[0] || cfg.http_full_cfg) 2148 2119 fprintf_conf(f, CONFVARWIDTH, "description", "%s\n", account->description); 2149 2120 #endif 2150 if (account->disabled || (!account->disabled && cfg.http_full_cfg))2121 if (account->disabled || cfg.http_full_cfg) 2151 2122 fprintf_conf(f, CONFVARWIDTH, "disabled", "%d\n", account->disabled); 2152 2123 2153 if (account->expirationdate || (!account->expirationdate && cfg.http_full_cfg)) {2124 if (account->expirationdate || cfg.http_full_cfg) { 2154 2125 struct tm timeinfo; 2155 2126 localtime_r(&account->expirationdate, &timeinfo); … … 2175 2146 2176 2147 //group 2177 if (account->grp || (!account->grp && cfg.http_full_cfg)) {2148 if (account->grp || cfg.http_full_cfg) { 2178 2149 value = mk_t_group(account->grp); 2179 2150 fprintf_conf(f, CONFVARWIDTH, "group", "%s\n", value); … … 2181 2152 } 2182 2153 2183 if (account->dyndns[0] || (!account->dyndns[0] && cfg.http_full_cfg))2154 if (account->dyndns[0] || cfg.http_full_cfg) 2184 2155 fprintf_conf(f, CONFVARWIDTH, "hostname", "%s\n", account->dyndns); 2185 2156 2186 if (account->uniq || (!account->uniq && cfg.http_full_cfg))2157 if (account->uniq || cfg.http_full_cfg) 2187 2158 fprintf_conf(f, CONFVARWIDTH, "uniq", "%d\n", account->uniq); 2188 2159 2189 if (account->tosleep || (!account->tosleep && cfg.http_full_cfg))2160 if (account->tosleep != cfg.tosleep || cfg.http_full_cfg) 2190 2161 fprintf_conf(f, CONFVARWIDTH, "sleep", "%d\n", account->tosleep); 2191 2162 2192 if (account->monlvl != cfg.mon_level || (account->monlvl == cfg.mon_level && cfg.http_full_cfg))2163 if (account->monlvl != cfg.mon_level || cfg.http_full_cfg) 2193 2164 fprintf_conf(f, CONFVARWIDTH, "monlevel", "%d\n", account->monlvl); 2194 2165 … … 2202 2173 free(value); 2203 2174 2204 } 2175 } else if (cfg.http_full_cfg) fprintf_conf(f, CONFVARWIDTH, "au", "\n"); 2205 2176 2206 2177 value = mk_t_service((uint64)account->sidtabok, (uint64)account->sidtabno); … … 2210 2181 2211 2182 //CAID 2212 if (account->ctab.caid[0] || (!account->ctab.caid[0] && cfg.http_full_cfg)) {2183 if (account->ctab.caid[0] || cfg.http_full_cfg) { 2213 2184 value = mk_t_caidtab(&account->ctab); 2214 2185 fprintf_conf(f, CONFVARWIDTH, "caid", "%s\n", value); … … 2217 2188 2218 2189 //betatunnel 2219 if (account->ttab.bt_caidfrom[0] || (!account->ttab.bt_caidfrom[0] && cfg.http_full_cfg)) {2190 if (account->ttab.bt_caidfrom[0] || cfg.http_full_cfg) { 2220 2191 value = mk_t_tuntab(&account->ttab); 2221 2192 fprintf_conf(f, CONFVARWIDTH, "betatunnel", "%s\n", value); … … 2224 2195 2225 2196 //ident 2226 if (account->ftab.nfilts || (!account->ftab.nfilts && cfg.http_full_cfg)) {2197 if (account->ftab.nfilts || cfg.http_full_cfg) { 2227 2198 value = mk_t_ftab(&account->ftab); 2228 2199 fprintf_conf(f, CONFVARWIDTH, "ident", "%s\n", value); … … 2231 2202 2232 2203 //CHID 2233 if (account->fchid.nfilts || (!account->fchid.nfilts && cfg.http_full_cfg)) {2204 if (account->fchid.nfilts || cfg.http_full_cfg) { 2234 2205 value = mk_t_ftab(&account->fchid); 2235 2206 fprintf_conf(f, CONFVARWIDTH, "chid", "%s\n", value); … … 2237 2208 } 2238 2209 2239 if ((account->c35_suppresscmd08 != cfg.c35_suppresscmd08) || ((account->c35_suppresscmd08 == cfg.c35_suppresscmd08) && cfg.http_full_cfg))2210 if ((account->c35_suppresscmd08 != cfg.c35_suppresscmd08) || cfg.http_full_cfg) 2240 2211 fprintf_conf(f, CONFVARWIDTH, "suppresscmd08", "%d\n", account->c35_suppresscmd08); 2241 2212 2242 if (account->cccmaxhops != 10 || ((account->cccmaxhops == 10) && cfg.http_full_cfg))2213 if (account->cccmaxhops != 10 || cfg.http_full_cfg) 2243 2214 fprintf_conf(f, CONFVARWIDTH, "cccmaxhops", "%d\n", account->cccmaxhops); 2244 2215 2245 if ((account->cccreshare != cfg.cc_reshare) || ((account->cccreshare == cfg.cc_reshare) && cfg.http_full_cfg))2216 if ((account->cccreshare != cfg.cc_reshare) || cfg.http_full_cfg) 2246 2217 fprintf_conf(f, CONFVARWIDTH, "cccreshare", "%d\n", account->cccreshare); 2247 2218 2248 if ((account->cccignorereshare != cfg.cc_ignore_reshare) || ((account->cccignorereshare == cfg.cc_ignore_reshare) && cfg.http_full_cfg))2219 if ((account->cccignorereshare != cfg.cc_ignore_reshare) || cfg.http_full_cfg) 2249 2220 fprintf_conf(f, CONFVARWIDTH, "cccignorereshare", "%d\n", account->cccignorereshare); 2250 2221 2251 if (account->c35_sleepsend || (!account->c35_sleepsend && cfg.http_full_cfg))2222 if (account->c35_sleepsend || cfg.http_full_cfg) 2252 2223 fprintf_conf(f, CONFVARWIDTH, "sleepsend", "%d\n", account->c35_sleepsend); 2253 2224 2254 if (account->failban || (!account->failban && cfg.http_full_cfg))2225 if (account->failban || cfg.http_full_cfg) 2255 2226 fprintf_conf(f, CONFVARWIDTH, "failban", "%d\n", account->failban); 2256 2227 2257 if ((account->ncd_keepalive != cfg.ncd_keepalive) || ((account->ncd_keepalive == cfg.ncd_keepalive) && cfg.http_full_cfg))2228 if ((account->ncd_keepalive != cfg.ncd_keepalive) || cfg.http_full_cfg) 2258 2229 fprintf_conf(f, CONFVARWIDTH, "keepalive", "%d\n", account->ncd_keepalive); 2259 2230 2260 2231 #ifdef CS_ANTICASC 2261 if (account->ac_users || (!account->ac_users && cfg.http_full_cfg))2232 if (account->ac_users || cfg.http_full_cfg) 2262 2233 fprintf_conf(f, CONFVARWIDTH, "numusers", "%d\n", account->ac_users); 2263 if (account->ac_penalty || (!account->ac_penalty && cfg.http_full_cfg))2234 if (account->ac_penalty || cfg.http_full_cfg) 2264 2235 fprintf_conf(f, CONFVARWIDTH, "penalty", "%d\n", account->ac_penalty); 2265 2236 #endif … … 2306 2277 2307 2278 fprintf_conf(f, CONFVARWIDTH, "device", "%s", rdr->device); 2308 if (rdr->r_port )2279 if (rdr->r_port || cfg.http_full_cfg) 2309 2280 fprintf(f, ",%d", rdr->r_port); 2310 if (rdr->l_port )2281 if (rdr->l_port || cfg.http_full_cfg) 2311 2282 fprintf(f, ",%d", rdr->l_port); 2312 if ( isphysical && rdr->slot)2283 if ((rdr->slot || cfg.http_full_cfg) && isphysical) 2313 2284 fprintf(f, ":%d", rdr->slot); 2314 2285 fprintf(f, "\n"); … … 2316 2287 #ifdef LIBUSB 2317 2288 if (!(rdr->typ & R_IS_NETWORK)) 2318 if (rdr->device_endpoint )2289 if (rdr->device_endpoint || cfg.http_full_cfg) 2319 2290 fprintf_conf(f, CONFVARWIDTH, "device_out_endpoint", "0x%2X\n", rdr->device_endpoint); 2320 2291 #endif 2321 2292 2322 if (rdr->ncd_key[0] || rdr->ncd_key[13] ) {2293 if (rdr->ncd_key[0] || rdr->ncd_key[13] || cfg.http_full_cfg) { 2323 2294 fprintf_conf(f, CONFVARWIDTH, "key", ""); 2324 2295 for (j = 0; j < 14; j++) { … … 2328 2299 } 2329 2300 2330 if ( rdr->r_usr[0]&& !isphysical)2301 if ((rdr->r_usr[0] || cfg.http_full_cfg) && !isphysical) 2331 2302 fprintf_conf(f, CONFVARWIDTH, "user", "%s\n", rdr->r_usr); 2332 2303 2333 if (strlen(rdr->r_pwd) > 0 )2304 if (strlen(rdr->r_pwd) > 0 || cfg.http_full_cfg) 2334 2305 fprintf_conf(f, CONFVARWIDTH, "password", "%s\n", rdr->r_pwd); 2335 2306 2336 if(strcmp(rdr->pincode, "none") )2307 if(strcmp(rdr->pincode, "none") || cfg.http_full_cfg) 2337 2308 fprintf_conf(f, CONFVARWIDTH, "pincode", "%s\n", rdr->pincode); 2338 2309 2339 if ( rdr->emmfile&& isphysical)2310 if ((rdr->emmfile || cfg.http_full_cfg) && isphysical) 2340 2311 fprintf_conf(f, CONFVARWIDTH, "readnano", "%s\n", rdr->emmfile); 2341 2312 2342 2313 value = mk_t_service((uint64)rdr->sidtabok, (uint64)rdr->sidtabno); 2343 if (strlen(value) > 0 )2314 if (strlen(value) > 0 || cfg.http_full_cfg) 2344 2315 fprintf_conf(f, CONFVARWIDTH, "services", "%s\n", value); 2345 2316 free(value); 2346 2317 2347 if ( rdr->tcp_ito&& !isphysical && rdr->typ != R_CCCAM)2318 if ((rdr->tcp_ito || cfg.http_full_cfg) && !isphysical && rdr->typ != R_CCCAM) 2348 2319 fprintf_conf(f, CONFVARWIDTH, "inactivitytimeout", "%d\n", rdr->tcp_ito); 2349 2320 2350 if ( rdr->tcp_rto != 30&& !isphysical)2321 if ((rdr->tcp_rto != 30 || cfg.http_full_cfg) && !isphysical) 2351 2322 fprintf_conf(f, CONFVARWIDTH, "reconnecttimeout", "%d\n", rdr->tcp_rto); 2352 2323 2353 if ( rdr->ncd_disable_server_filt&& rdr->typ == R_NEWCAMD)2324 if ((rdr->ncd_disable_server_filt || cfg.http_full_cfg) && rdr->typ == R_NEWCAMD) 2354 2325 fprintf_conf(f, CONFVARWIDTH, "disableserverfilter", "%d\n", rdr->ncd_disable_server_filt); 2355 2326 2356 if ( rdr->smargopatch&& isphysical)2327 if ((rdr->smargopatch || cfg.http_full_cfg) && isphysical) 2357 2328 fprintf_conf(f, CONFVARWIDTH, "smargopatch", "%d\n", rdr->smargopatch); 2358 2329 2359 if ( rdr->show_cls != 10&& isphysical)2330 if ((rdr->show_cls != 10 || cfg.http_full_cfg) && isphysical) 2360 2331 fprintf_conf(f, CONFVARWIDTH, "showcls", "%d\n", rdr->show_cls); 2361 2332 2362 if (rdr->fallback )2333 if (rdr->fallback || cfg.http_full_cfg) 2363 2334 fprintf_conf(f, CONFVARWIDTH, "fallback", "%d\n", rdr->fallback); 2364 2335 2365 if (rdr->log_port )2336 if (rdr->log_port || cfg.http_full_cfg) 2366 2337 fprintf_conf(f, CONFVARWIDTH, "logport", "%d\n", rdr->log_port); 2367 2338 2368 2339 value = mk_t_caidtab(&rdr->ctab); 2369 if (strlen(value) > 0 )2340 if (strlen(value) > 0 || cfg.http_full_cfg) 2370 2341 fprintf_conf(f, CONFVARWIDTH, "caid", "%s\n", value); 2371 2342 free(value); 2372 2343 2373 if ( rdr->boxid&& isphysical)2344 if ((rdr->boxid || cfg.http_full_cfg) && isphysical) 2374 2345 fprintf_conf(f, CONFVARWIDTH, "boxid", "%08X\n", rdr->boxid); 2375 2346 2376 if( rdr->fix_9993&& isphysical)2347 if((rdr->fix_9993 || cfg.http_full_cfg) && isphysical) 2377 2348 fprintf_conf(f, CONFVARWIDTH, "fix9993", "%d\n", rdr->fix_9993); 2378 2349 2379 2350 // rsakey 2380 2351 int len = check_filled(rdr->rsa_mod, 120); 2381 if ( len > 0&& isphysical) {2352 if ((len > 0 || cfg.http_full_cfg) && isphysical) { 2382 2353 if(len > 64) len = 120; 2383 2354 else len = 64; … … 2385 2356 } 2386 2357 2387 if ( rdr->force_irdeto&& isphysical) {2358 if ((rdr->force_irdeto || cfg.http_full_cfg) && isphysical) { 2388 2359 fprintf_conf(f, CONFVARWIDTH, "force_irdeto", "%d\n", rdr->force_irdeto); 2389 2360 } 2390 2361 2391 if ( check_filled(rdr->nagra_boxkey, 8) > 0&& isphysical)2362 if ((check_filled(rdr->nagra_boxkey, 8) > 0 || cfg.http_full_cfg) && isphysical) 2392 2363 fprintf_conf(f, CONFVARWIDTH, "boxkey", "%s\n", cs_hexdump(0, rdr->nagra_boxkey, 8)); 2393 2364 2394 if ( rdr->atr[0]&& isphysical) {2365 if ((rdr->atr[0] || cfg.http_full_cfg) && isphysical) { 2395 2366 fprintf_conf(f, CONFVARWIDTH, "atr", ""); 2396 2367 for (j=0; j < rdr->atrlen/2; j++) { … … 2407 2378 } 2408 2379 2409 if ( rdr->nagra_read&& isphysical)2380 if ((rdr->nagra_read || cfg.http_full_cfg) && isphysical) 2410 2381 fprintf_conf(f, CONFVARWIDTH, "nagra_read", "%d\n", rdr->nagra_read); 2411 2382 2412 if ( rdr->mhz&& isphysical)2383 if ((rdr->mhz || cfg.http_full_cfg) && isphysical) 2413 2384 fprintf_conf(f, CONFVARWIDTH, "mhz", "%d\n", rdr->mhz); 2414 2385 2415 if ( rdr->cardmhz&& isphysical)2386 if ((rdr->cardmhz || cfg.http_full_cfg) && isphysical) 2416 2387 fprintf_conf(f, CONFVARWIDTH, "cardmhz", "%d\n", rdr->cardmhz); 2417 2388 2418 2389 value = mk_t_ftab(&rdr->ftab); 2419 if (strlen(value) > 0 )2390 if (strlen(value) > 0 || cfg.http_full_cfg) 2420 2391 fprintf_conf(f, CONFVARWIDTH, "ident", "%s\n", value); 2421 2392 free(value); … … 2424 2395 2425 2396 value = mk_t_ftab(&rdr->fchid); 2426 if (strlen(value) > 0 )2397 if (strlen(value) > 0 || cfg.http_full_cfg) 2427 2398 fprintf_conf(f, CONFVARWIDTH, "chid", "%s\n", value); 2428 2399 free(value); 2429 2400 2430 2401 value = mk_t_aeskeys(rdr); 2431 if (strlen(value) > 0 )2402 if (strlen(value) > 0 || cfg.http_full_cfg) 2432 2403 fprintf_conf(f, CONFVARWIDTH, "aeskeys", "%s\n", value); 2433 2404 free(value); 2434 2405 2435 if ( rdr->show_cls && !rdr->show_cls == 10)2406 if ((rdr->show_cls && !rdr->show_cls == 10) || cfg.http_full_cfg) 2436 2407 fprintf_conf(f, CONFVARWIDTH, "showcls", "%d\n", rdr->show_cls); 2437 2408 2438 2409 value = mk_t_group(rdr->grp); 2439 if (strlen(value) > 0 )2410 if (strlen(value) > 0 || cfg.http_full_cfg) 2440 2411 fprintf_conf(f, CONFVARWIDTH, "group", "%s\n", value); 2441 2412 free(value); 2442 2413 2443 if (rdr->cachemm )2414 if (rdr->cachemm || cfg.http_full_cfg) 2444 2415 fprintf_conf(f, CONFVARWIDTH, "emmcache", "%d,%d,%d\n", rdr->cachemm, rdr->rewritemm, rdr->logemm); 2445 2416 2446 if (rdr->blockemm_unknown )2417 if (rdr->blockemm_unknown || cfg.http_full_cfg) 2447 2418 fprintf_conf(f, CONFVARWIDTH, "blockemm-unknown", "%d\n", rdr->blockemm_unknown); 2448 2419 2449 if (rdr->blockemm_u )2420 if (rdr->blockemm_u || cfg.http_full_cfg) 2450 2421 fprintf_conf(f, CONFVARWIDTH, "blockemm-u", "%d\n", rdr->blockemm_u); 2451 2422 2452 if (rdr->blockemm_s )2423 if (rdr->blockemm_s || cfg.http_full_cfg) 2453 2424 fprintf_conf(f, CONFVARWIDTH, "blockemm-s", "%d\n", rdr->blockemm_s); 2454 2425 2455 if (rdr->blockemm_g )2426 if (rdr->blockemm_g || cfg.http_full_cfg) 2456 2427 fprintf_conf(f, CONFVARWIDTH, "blockemm-g", "%d\n", rdr->blockemm_g); 2457 2428 2458 if (rdr->lb_weight != 100 )2429 if (rdr->lb_weight != 100 || cfg.http_full_cfg) 2459 2430 fprintf_conf(f, CONFVARWIDTH, "lb_weight", "%d\n", rdr->lb_weight); 2460 2431 2461 2432 //savenano 2462 2433 value = mk_t_nano(rdr, 0x02); 2463 if (strlen(value) > 0 )2434 if (strlen(value) > 0 || cfg.http_full_cfg) 2464 2435 fprintf_conf(f, CONFVARWIDTH, "savenano", "%s\n", value); 2465 2436 free(value); … … 2467 2438 //blocknano 2468 2439 value = mk_t_nano(rdr, 0x01); 2469 if (strlen(value) > 0 )2440 if (strlen(value) > 0 || cfg.http_full_cfg) 2470 2441 fprintf_conf(f, CONFVARWIDTH, "blocknano", "%s\n", value); 2471 2442 free(value); 2472 2443 2473 2444 if (rdr->typ == R_CCCAM) { 2474 if (rdr->cc_version[0] )2445 if (rdr->cc_version[0] || cfg.http_full_cfg) 2475 2446 fprintf_conf(f, CONFVARWIDTH, "cccversion", "%s\n", rdr->cc_version); 2476 2447 2477 if (rdr->cc_maxhop != 10 )2448 if (rdr->cc_maxhop != 10 || cfg.http_full_cfg) 2478 2449 fprintf_conf(f, CONFVARWIDTH, "cccmaxhops", "%d\n", rdr->cc_maxhop); 2479 2450 2480 if (rdr->cc_mindown > 0 )2451 if (rdr->cc_mindown > 0 || cfg.http_full_cfg) 2481 2452 fprintf_conf(f, CONFVARWIDTH, "cccmindown", "%d\n", rdr->cc_mindown); 2482 2453 2483 if (rdr->cc_want_emu )2454 if (rdr->cc_want_emu || cfg.http_full_cfg) 2484 2455 fprintf_conf(f, CONFVARWIDTH, "cccwantemu", "%d\n", rdr->cc_want_emu); 2485 2456 2486 if (rdr->cc_keepalive )2457 if (rdr->cc_keepalive || cfg.http_full_cfg) 2487 2458 fprintf_conf(f, CONFVARWIDTH, "ccckeepalive", "%d\n", rdr->cc_keepalive); 2488 2459 2489 if (rdr->cc_reshare != cfg.cc_reshare )2460 if (rdr->cc_reshare != cfg.cc_reshare || cfg.http_full_cfg) 2490 2461 fprintf_conf(f, CONFVARWIDTH, "cccreshare", "%d\n", rdr->cc_reshare); 2491 2462 } 2492 2463 2493 if ( rdr->deprecated&& isphysical)2464 if ((rdr->deprecated || cfg.http_full_cfg) && isphysical) 2494 2465 fprintf_conf(f, CONFVARWIDTH, "deprecated", "%d\n", rdr->deprecated); 2495 2466 2496 if (rdr->audisabled )2467 if (rdr->audisabled || cfg.http_full_cfg) 2497 2468 fprintf_conf(f, CONFVARWIDTH, "audisabled", "%d\n", rdr->audisabled); 2498 2469 2499 if (rdr->auprovid )2470 if (rdr->auprovid || cfg.http_full_cfg) 2500 2471 fprintf_conf(f, CONFVARWIDTH, "auprovid", "%06lX", rdr->auprovid); 2501 2472 2502 if (rdr->ndsversion&& isphysical)2503 2504 2505 if (rdr->ratelimitecm&& isphysical) {2506 2507 2473 if ((rdr->ndsversion || cfg.http_full_cfg) && isphysical) 2474 fprintf_conf(f, CONFVARWIDTH, "ndsversion", "%d\n", rdr->ndsversion); 2475 2476 if ((rdr->ratelimitecm || cfg.http_full_cfg) && isphysical) { 2477 fprintf_conf(f, CONFVARWIDTH, "ratelimitecm", "%d\n", rdr->ratelimitecm); 2478 fprintf_conf(f, CONFVARWIDTH, "ratelimitseconds", "%d\n", rdr->ratelimitseconds); 2508 2479 } 2509 2480 fprintf(f, "\n\n"); … … 3820 3791 3821 3792 if (!strcmp(token, "ndsversion")) { 3822 if (strlen(value) == 0) { 3823 rdr->ndsversion = 0; 3824 return; 3825 } else { 3826 rdr->ndsversion = atoi(value); 3827 return; 3828 } 3793 rdr->ndsversion = strToIntVal(value, 0); 3794 return; 3829 3795 } 3830 3796 … … 3832 3798 #ifdef AZBOX 3833 3799 if (!strcmp(token, "mode")) { 3834 if(strlen(value) == 0) { 3835 rdr->mode = -1; 3836 return; 3837 } else { 3838 rdr->mode = atoi(value); 3839 return; 3840 } 3800 rdr->mode = strToIntVal(value, -1); 3801 return; 3841 3802 } 3842 3803 #endif … … 3991 3952 rdr->cc_mindown = 0; 3992 3953 rdr->lb_weight = 100; 3993 strcpy(rdr->pincode, "none");3954 cs_strncpy(rdr->pincode, "none", sizeof(rdr->pincode)); 3994 3955 rdr->ndsversion = 0; 3995 3956 for (i=1; i<CS_MAXCAIDTAB; rdr->ctab.mask[i++]=0xffff);
Note:
See TracChangeset
for help on using the changeset viewer.