Changeset 1690
- Timestamp:
- 02/25/10 21:10:58 (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-config.c
r1686 r1690 544 544 545 545 if (token[0] != '#') 546 cs_log( 546 cs_log("Warning: keyword '%s' in anticascading section not recognized",token); 547 547 } 548 548 #endif … … 660 660 661 661 if (token[0] != '#') 662 cs_log( 662 cs_log("Warning: keyword '%s' in camd33 section not recognized",token); 663 663 } 664 664 … … 696 696 697 697 if (token[0] != '#') 698 cs_log( 698 cs_log("Warning: keyword '%s' in camd35 section not recognized", token); 699 699 } 700 700 … … 732 732 733 733 if (token[0] != '#') 734 cs_log( 734 cs_log("Warning: keyword '%s' in camd35 tcp section not recognized", token); 735 735 } 736 736 … … 786 786 787 787 if (token[0] != '#') 788 cs_log( 788 cs_log("Warning: keyword '%s' in newcamd section not recognized", token); 789 789 } 790 790 … … 833 833 834 834 if (token[0] != '#') 835 cs_log( 835 cs_log("Warning: keyword '%s' in cccam section not recognized",token); 836 836 } 837 837 … … 874 874 875 875 if (token[0] != '#') 876 cs_log( 876 cs_log("Warning: keyword '%s' in radegast section not recognized", token); 877 877 } 878 878 … … 888 888 } 889 889 if (token[0] != '#') 890 cs_log( 890 cs_log("Warning: keyword '%s' in serial section not recognized", token); 891 891 } 892 892 … … 913 913 } 914 914 if (token[0] != '#') 915 fprintf(stderr,"Warning: keyword '%s' in gbox section not recognized\n",token);915 cs_log("Warning: keyword '%s' in gbox section not recognized\n",token); 916 916 } 917 917 #endif … … 928 928 929 929 if (token[0] != '#') 930 fprintf(stderr,"Warning: keyword '%s' in dvbapi section not recognized\n",token);930 cs_log("Warning: keyword '%s' in dvbapi section not recognized\n",token); 931 931 } 932 932 #endif … … 951 951 case TAG_DVBAPI : chk_t_dvbapi(token, value); break; 952 952 #else 953 case TAG_DVBAPI : fprintf(stderr,"Warning: OSCam compiled without DVB API support.\n"); break;953 case TAG_DVBAPI : cs_log("Warning: OSCam compiled without DVB API support.\n"); break; 954 954 #endif 955 955 #ifdef CS_ANTICASC … … 1297 1297 1298 1298 if (token[0] != '#') 1299 cs_log( 1299 cs_log("Warning: keyword '%s' in account section not recognized",token); 1300 1300 } 1301 1301 … … 1441 1441 if (!strcmp(token, "srvid")) { chk_entry4sidtab(value, sidtab, 2); return; } 1442 1442 if (token[0] != '#') 1443 fprintf(stderr,"Warning: keyword '%s' in sidtab section not recognized\n",token);1443 cs_log("Warning: keyword '%s' in sidtab section not recognized\n",token); 1444 1444 } 1445 1445 … … 1700 1700 1701 1701 if (!strcmp(token, "fallback")) { 1702 rdr->fallback = atoi(value) ? 1 : 0; 1703 return; 1702 if(strlen(value) == 0) { 1703 rdr->fallback = 0; 1704 return; 1705 } else { 1706 rdr->fallback = atoi(value) ? 1 : 0; 1707 return; 1708 } 1704 1709 } 1705 1710 1706 1711 if (!strcmp(token, "logport")) { 1707 rdr->log_port = atoi(value); 1708 return; 1712 if(strlen(value) == 0) { 1713 rdr->log_port = 0; 1714 return; 1715 } else { 1716 rdr->log_port = atoi(value); 1717 return; 1718 } 1709 1719 } 1710 1720 1711 1721 if (!strcmp(token, "caid")) { 1712 chk_caidtab(value, &rdr->ctab); 1713 return; 1722 if(strlen(value) == 0) { 1723 clear_caidtab(&rdr->ctab); 1724 return; 1725 } else { 1726 chk_caidtab(value, &rdr->ctab); 1727 return; 1728 } 1714 1729 } 1715 1730 1716 1731 if (!strcmp(token, "boxid")) { 1717 rdr->boxid = a2i(value, 4); 1718 return; 1732 if(strlen(value) == 0) { 1733 rdr->boxid = 0; 1734 return; 1735 } else { 1736 rdr->boxid = a2i(value, 4); 1737 return; 1738 } 1719 1739 } 1720 1740 … … 1766 1786 1767 1787 if (!strcmp(token, "mhz")) { 1768 rdr->mhz = atoi(value); 1769 return; 1788 if(strlen(value) == 0) { 1789 rdr->mhz = 0; 1790 return; 1791 } else { 1792 rdr->mhz = atoi(value); 1793 return; 1794 } 1770 1795 } 1771 1796 1772 1797 if (!strcmp(token, "cardmhz")) { 1773 rdr->cardmhz = atoi(value); 1774 return; 1798 if(strlen(value) == 0) { 1799 rdr->cardmhz = 0; 1800 return; 1801 } else { 1802 rdr->cardmhz = atoi(value); 1803 return; 1804 } 1775 1805 } 1776 1806 … … 1851 1881 } 1852 1882 1853 fprintf(stderr, "WARNING: value '%s' in protocol-line not recognized, assuming MOUSE\n",value);1883 cs_log( "WARNING: value '%s' in protocol-line not recognized, assuming MOUSE",value); 1854 1884 rdr->typ = R_MOUSE; 1855 1885 return; … … 1857 1887 1858 1888 if (!strcmp(token, "loadbalanced")) { 1859 rdr->loadbalanced = atoi(value); 1860 return; 1889 if(strlen(value) == 0) { 1890 rdr->loadbalanced = 0; 1891 return; 1892 } else { 1893 rdr->loadbalanced = atoi(value); 1894 return; 1895 } 1861 1896 } 1862 1897 1863 1898 if (!strcmp(token, "ident")) { 1864 chk_ftab(value, &rdr->ftab,"reader",rdr->label,"provid"); 1865 return; 1899 if(strlen(value) == 0) { 1900 clear_ftab(&rdr->ftab); 1901 return; 1902 } else { 1903 chk_ftab(value, &rdr->ftab,"reader",rdr->label,"provid"); 1904 return; 1905 } 1866 1906 } 1867 1907 … … 1889 1929 } 1890 1930 1891 if (!strcmp(token, "group")) 1892 { 1893 for (ptr = strtok(value, ","); ptr; ptr = strtok(NULL, ",")) { 1894 int g; 1895 g = atoi(ptr); 1896 if ((g>0) && (g<33)) { 1897 rdr->grp |= (1<<(g-1)); 1931 if (!strcmp(token, "group")) { 1932 if(strlen(value) == 0) { 1933 rdr->grp = 0; 1934 return; 1935 } else { 1936 for (ptr = strtok(value, ","); ptr; ptr = strtok(NULL, ",")) { 1937 int g; 1938 g = atoi(ptr); 1939 if ((g>0) && (g<33)) { 1940 rdr->grp |= (1<<(g-1)); 1941 } 1898 1942 } 1899 }1900 return;1943 return; 1944 } 1901 1945 } 1902 1946 1903 1947 if (!strcmp(token, "emmcache")) { 1904 for (i = 0, ptr = strtok(value, ","); (i < 3) && (ptr); ptr = strtok(NULL, ","), i++) { 1905 switch(i) 1906 { 1907 case 0: 1908 rdr->cachemm = atoi(ptr); 1909 break; 1910 1911 case 1: 1912 rdr->rewritemm = atoi(ptr); 1913 break; 1914 1915 case 2: rdr->logemm = atoi(ptr); 1916 break; 1948 if(strlen(value) == 0) { 1949 rdr->cachemm = 0; 1950 rdr->rewritemm = 0; 1951 rdr->logemm = 0; 1952 return; 1953 } else { 1954 for (i = 0, ptr = strtok(value, ","); (i < 3) && (ptr); ptr = strtok(NULL, ","), i++) { 1955 switch(i) 1956 { 1957 case 0: 1958 rdr->cachemm = atoi(ptr); 1959 break; 1960 1961 case 1: 1962 rdr->rewritemm = atoi(ptr); 1963 break; 1964 1965 case 2: rdr->logemm = atoi(ptr); 1966 break; 1967 } 1917 1968 } 1918 } 1919 1920 if (rdr->rewritemm <= 0) {1921 fprintf(stderr, "Notice: Setting EMMCACHE to %i,1,%i instead of %i,%i,%i. ",1922 rdr->cachemm, rdr->logemm,1923 rdr->cachemm, rdr->rewritemm,1924 rdr->logemm); 1925 1926 fprintf(stderr, "Zero or negative number of rewrites is silly\n");1927 rdr->rewritemm = 1;1928 }1929 return;1969 1970 if (rdr->rewritemm <= 0) { 1971 fprintf(stderr, "Notice: Setting EMMCACHE to %i,1,%i instead of %i,%i,%i. ", 1972 rdr->cachemm, rdr->logemm, 1973 rdr->cachemm, rdr->rewritemm, 1974 rdr->logemm); 1975 1976 fprintf(stderr, "Zero or negative number of rewrites is silly\n"); 1977 rdr->rewritemm = 1; 1978 } 1979 return; 1980 } 1930 1981 } 1931 1982 -
trunk/oscam-simples.c
r1683 r1690 379 379 } 380 380 381 /* Clears the s_ftab struct provided by setting nfilts and nprids to zero. */ 382 void clear_ftab(struct s_ftab *ftab){ 383 int i, j; 384 for (i = 0; i < CS_MAXFILTERS; i++) { 385 ftab->filts[i].caid = 0; 386 for (j = 0; j < CS_MAXPROV; j++) 387 ftab->filts[i].prids[j] = 0; 388 ftab->filts[i].nprids = 0; 389 } 390 ftab->nfilts = 0; 391 } 392 381 393 /* Clears given caidtab */ 382 394 void clear_caidtab(struct s_caidtab *ctab){
Note:
See TracChangeset
for help on using the changeset viewer.